Jeff Peeler 378383b674 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@162894 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2008-12-10 22:12:40 +00:00

..

ael

Merged revisions 162271 via svnmerge from

2008-12-09 20:44:10 +00:00

snmp

Merged revisions 162583 via svnmerge from

2008-12-10 11:36:28 +00:00

Makefile

Merged revisions 157974 via svnmerge from

2008-11-20 00:12:32 +00:00

res_adsi.c

Only reload if the config file has changed.

2007-12-01 01:37:50 +00:00

res_ael_share.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_agi.c

Merged revisions 157743 via svnmerge from

2008-11-19 13:48:47 +00:00

res_clioriginate.c

Merged revisions 102378 via svnmerge from

2008-02-05 15:10:36 +00:00

res_config_curl.c

Merged revisions 107791 via svnmerge from

2008-03-11 22:59:52 +00:00

res_config_ldap.c

Merged revisions 129864 via svnmerge from

2008-07-11 01:01:39 +00:00

res_config_odbc.c

Merged revisions 129758 via svnmerge from

2008-07-10 21:24:31 +00:00

res_config_pgsql.c

Merged revisions 145076 via svnmerge from

2008-09-29 00:13:00 +00:00

res_config_sqlite.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

res_convert.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

res_crypto.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +00:00

res_indications.c

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

res_jabber.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +00:00

res_limit.c

Merged revisions 129045 via svnmerge from

2008-07-08 16:41:31 +00:00

res_monitor.c

Fix another spot where a hard-coded '|' hadn't been converted to ','

2008-02-20 15:21:51 +00:00

res_musiconhold.c

Merged revisions 162891 via svnmerge from

2008-12-10 22:12:40 +00:00

res_odbc.c

Merged revisions 137150 via svnmerge from

2008-08-11 00:27:46 +00:00

res_phoneprov.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +00:00

res_realtime.c

Merged revisions 155862 via svnmerge from

2008-11-11 19:49:56 +00:00

res_smdi.c

Merged revisions 117136 via svnmerge from

2008-05-19 16:58:10 +00:00

res_snmp.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_speech.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00