aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-05 01:09:15 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-05 01:09:15 +0000
commit21fa393eaa1ae47bbc27847d8bdeb17ad78e6fc5 (patch)
tree640162eea5804a67e70304bf81f1d6a108ef153f /res
parent5fc7233e546d33621ee594362400be522b8fd339 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@250790 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_musiconhold.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 35525c0b9..f0c8a27a5 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);
}