Jason Parker c6a0820063 Merged revisions 108683 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
r108683 | qwell | 2008-03-14 09:32:55 -0500 (Fri, 14 Mar 2008) | 12 lines

Merged revisions 108682 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r108682 | qwell | 2008-03-14 09:29:05 -0500 (Fri, 14 Mar 2008) | 4 lines

Fix a potential segfault if chan (or chan->music_state) is NULL.

Closes issue #12210, credit to edantie for pointing this out.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108684 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2008-03-14 14:33:33 +00:00

..

ael

Merged revisions 97889 via svnmerge from

2008-01-10 21:46:56 +00:00

snmp

Merged revisions 105572 via svnmerge from

2008-03-03 18:08:05 +00:00

Makefile

Merged revisions 107373 via svnmerge from

2008-03-11 11:39: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 106399 via svnmerge from

2008-03-06 20:39:49 +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 107791 via svnmerge from

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

res_config_odbc.c

Merged revisions 107791 via svnmerge from

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

res_config_pgsql.c

Merged revisions 107791 via svnmerge from

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

res_config_sqlite.c

Merged revisions 107791 via svnmerge from

2008-03-11 22:59:52 +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

make configuration variable const so they are not accidentally

2007-12-18 10:24:58 +00:00

res_indications.c

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

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

res_jabber.c

Merged revisions 105326 via svnmerge from

2008-02-29 14:50:40 +00:00

res_limit.c

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

2007-11-19 18:52:04 +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 108683 via svnmerge from

2008-03-14 14:33:33 +00:00

res_odbc.c

Clarify the pooling functionality by changing the config file keyword

2008-02-01 18:08:44 +00:00

res_phoneprov.c

Merged revisions 108295 via svnmerge from

2008-03-12 22:50:14 +00:00

res_realtime.c

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

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

res_smdi.c

Merged revisions 104536 via svnmerge from

2008-02-27 15:58:28 +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