diff options
author | Jeff Peeler <jpeeler@digium.com> | 2010-03-05 01:05:46 +0000 |
---|---|---|
committer | Jeff Peeler <jpeeler@digium.com> | 2010-03-05 01:05:46 +0000 |
commit | 7f29269d684ff4d721709405edbb205058814800 (patch) | |
tree | 3d54b0ff3f85cc1326d1235b25e79e7acc9d1e4d /res | |
parent | 7acfebf2b83d3010b7b5bbfef1a625b8694afdca (diff) |
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/trunk@250787 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r-- | res/res_musiconhold.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 82e053478..676b0184a 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -560,7 +560,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); } |