From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 5 Mar 2010 01:08:36 +0000 (+0000)
Subject: Merged revisions 250787 via svnmerge from
X-Git-Tag: 1.6.1.19-rc1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9358fd3d378f94114f4a8b44ccf49e74a408bf1;p=thirdparty%2Fasterisk.git

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)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@250789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index a8602f44b4..8022bcf5a9 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -533,7 +533,7 @@ static int spawn_mp3(struct mohclass *class)
 		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);
 		}