Mark Michelson 892f98a1e6 Merged revisions 157306 via svnmerge from ...

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

................
r157306 | mmichelson | 2008-11-18 12:31:08 -0600 (Tue, 18 Nov 2008) | 20 lines

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

........
r157305 | mmichelson | 2008-11-18 12:25:55 -0600 (Tue, 18 Nov 2008) | 12 lines

Fix a crash in the end_bridge_callback of app_dial and
app_followme which would occur at the end of an attended
transfer. The error occurred because we initially stored
a pointer to an ast_channel which then was hung up due
to a masquerade.

This commit adds a "fixup" callback to the bridge_config
structure to allow for end_bridge_callback_data to be
changed in the case that a new channel pointer is needed
for the end_bridge_callback.


........

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


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

2008-11-18 18:32:54 +00:00

..

asterisk

Merged revisions 157306 via svnmerge from

2008-11-18 18:32:54 +00:00

solaris-compat

fix the provided unsetenv for solaris to return an int like it's supposed to

2006-03-29 04:14:12 +00:00

asterisk.h

Merged revisions 154919 via svnmerge from

2008-11-05 22:02:19 +00:00

jitterbuf.h

Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not

2008-03-18 15:43:34 +00:00