From 4f170a1a25c522bf8dc334e2e2ab2c2da263fa44 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Fri, 5 Mar 2010 01:09:15 +0000 Subject: [PATCH] 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.2@250790 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_musiconhold.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 35525c0b96..f0c8a27a5b 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -534,7 +534,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); } -- 2.47.2