Merged revisions 162874 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Wed, 10 Dec 2008 22:11:46 +0000 (22:11 +0000)
committerJeff Peeler <jpeeler@digium.com>
Wed, 10 Dec 2008 22:11:46 +0000 (22:11 +0000)
commit040e552c26e7d1d8a49fd3a122d6ba9aec5f8d92
treee5eeddeb4a51a6b1e8ad8bc6850adf8afece0548
parenta039a65656bccbe1ff6fdd673f7bcdfec2b34c71
Merged revisions 162874 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r162874 | jpeeler | 2008-12-10 16:04:18 -0600 (Wed, 10 Dec 2008) | 5 lines

(closes issue #13229)
Reported by: clegall_proformatique

Ensure that moh_generate does not return prematurely before local_ast_moh_stop is called. Also, the sleep in mp3_spawn now only occurs for http locations since it seems to have been added originally only for failing media streams.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@162891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
res/res_musiconhold.c