[asterisk-commits] jpeeler: branch 1.6.0 r250788 - in /branches/1.6.0: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Mar  4 19:07:46 2010
New Revision: 250788

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250788
Log:
Merged revisions 250787 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r250787 | jpeeler | 2010-03-04 19:05:46 -0600 (Thu, 04 Mar 2010) | 16 lines
  
  Merged revisions 250786 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r250786 | jpeeler | 2010-03-04 19:02:58 -0600 (Thu, 04 Mar 2010) | 9 lines
    
    Fix not being able to specify a URL in MOH class directory.
    
    Don't attempt to chdir on a URL!
    
    (closes issue #16875)
    Reported by: raarts
    Patches: 
          moh-http.patch uploaded by raarts (license 937)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_musiconhold.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/res/res_musiconhold.c?view=diff&rev=250788&r1=250787&r2=250788
==============================================================================
--- branches/1.6.0/res/res_musiconhold.c (original)
+++ branches/1.6.0/res/res_musiconhold.c Thu Mar  4 19:07:46 2010
@@ -510,7 +510,7 @@
 #ifdef HAVE_CAP
 		cap_t cap;
 #endif
-		if (strcasecmp(class->dir, "nodir") && chdir(class->dir) < 0) {
+		if (strncasecmp(class->dir, "http://", 7) && strcasecmp(class->dir, "nodir") && chdir(class->dir) < 0) {
 			ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
 			_exit(1);
 		}