[svn-commits] jpeeler: trunk r250787 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Mar  4 19:05:46 2010
New Revision: 250787

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250787
Log:
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:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_musiconhold.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=250787&r1=250786&r2=250787
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Thu Mar  4 19:05:46 2010
@@ -560,7 +560,7 @@
 		ast_close_fds_above_n(STDERR_FILENO);
 
 		/* Child */
-		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);
 		}