diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-10 22:12:57 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-10 22:12:57 +0000 |
commit | 83fe7d612e01fc3eaba39b0d316b2ed50e88959e (patch) | |
tree | 893837694de19925c358e3584d78fd131d1a1471 /include | |
parent | ae8cb20c1dd0319ccdcb79b1d8206494e0ac7692 (diff) |
Merged revisions 162891 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r162891 | jpeeler | 2008-12-10 16:11:46 -0600 (Wed, 10 Dec 2008) | 13 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@162896 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions