diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-05 01:08:36 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-05 01:08:36 +0000 |
| commit | f6cf3cff890a3c18b8293312cd1a1af0746c5e19 (patch) | |
| tree | 88940dc84e3d94d60f015fdf3d6bfa9a22768bad /res/res_musiconhold.c | |
| parent | 1ec2e9a562acf65cd09242b3dd22d6cbbab58d46 (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.1@250789 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_musiconhold.c')
| -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 a8602f44b..8022bcf5a 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); } |