David Vossel 05332c17ce Merged revisions 219304 via svnmerge from ...

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

................
  r219304 | dvossel | 2009-09-17 16:59:21 -0500 (Thu, 17 Sep 2009) | 27 lines
  
  Merged revisions 219303 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219303 | dvossel | 2009-09-17 16:29:37 -0500 (Thu, 17 Sep 2009) | 21 lines
    
    INVITE w/Replaces deadlock fix
    
    This patch cleans up the locking logic in chan_sip.c's
    handle_invite_replaces() function as well as making use
    of ast_do_masquerade() rather than forcing the masquerade
    on an ast_read().  The code had several redundant unlocks
    that would result in 'freed more times than we've locked!'
    errors. I cleaned these up as well as moving all the unlock
    logic to the end of the function.  This patch should also
    resolve the issue people were having with the replacecall
    channel never being unlocked with one legged calls.
    
    (closes issue #15151)
    Reported by: irroot
    Patches:
          invite_w_replaces_1.4.diff uploaded by dvossel (license 671)
    Tested by: irroot, dvossel
    
    Review: https://reviewboard.asterisk.org/r/371/
  ........
................


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

2009-09-17 22:04:56 +00:00

..

h323

Merged revisions 201678 via svnmerge from

2009-06-18 16:51:54 +00:00

misdn

Merged revisions 212758 via svnmerge from

2009-08-18 16:48:01 +00:00

xpmr

Merged revisions 201678 via svnmerge from

2009-06-18 16:51:54 +00:00

chan_agent.c

Merged revisions 212581 via svnmerge from

2009-08-17 18:55:32 +00:00

chan_alsa.c

Merged revisions 196988 via svnmerge from

2009-05-27 13:05:27 +00:00

chan_console.c

Merged revisions 209554 via svnmerge from

2009-07-30 18:46:07 +00:00

chan_dahdi.c

Merged revisions 218430 via svnmerge from

2009-09-15 15:41:09 +00:00

chan_gtalk.c

Merged revisions 139281,175058,175089 via svnmerge from

2009-09-15 21:53:03 +00:00

chan_h323.c

Merged revisions 191219 via svnmerge from

2009-04-29 23:14:58 +00:00

chan_iax2.c

Merged revisions 217916 via svnmerge from

2009-09-10 23:18:45 +00:00

chan_jingle.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_local.c

Merged revisions 214945 via svnmerge from

2009-08-31 16:22:02 +00:00

chan_mgcp.c

AST-2009-005

2009-08-10 19:30:55 +00:00

chan_misdn.c

AST-2009-005

2009-08-10 19:30:55 +00:00

chan_nbs.c

one more place I forgot

2008-05-22 17:50:40 +00:00

chan_oss.c

AST-2009-005

2009-08-10 19:30:55 +00:00

chan_phone.c

gcc 4.4: Remove a nop memset size 0 that annoys gcc

2009-09-13 21:48:02 +00:00

chan_phone.h

rename DialTone.h to chan_phone.h because chan_phone.c is the only file using it

2008-05-28 20:00:21 +00:00

chan_sip.c

Merged revisions 219304 via svnmerge from

2009-09-17 22:04:56 +00:00

chan_skinny.c

Merged revisions 215665 via svnmerge from

2009-09-02 21:30:37 +00:00

chan_unistim.c

Merged revisions 192938 via svnmerge from

2009-05-07 17:15:00 +00:00

chan_usbradio.c

AST-2009-005

2009-08-10 19:30:55 +00:00

chan_vpb.cc

Merged revisions 209098 via svnmerge from

2009-07-27 20:28:28 +00:00

console_board.c

import the recent additions for video console into trunk,

2008-06-29 21:17:14 +00:00

console_gui.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.h

implement the 'freeze' function for incoming frames;

2008-06-30 15:45:15 +00:00

iax2-parser.c

Merged revisions 215955 via svnmerge from

2009-09-03 18:41:27 +00:00

iax2-parser.h

Merged revisions 215955 via svnmerge from

2009-09-03 18:41:27 +00:00

iax2-provision.c

AST-2009-005

2009-08-10 19:30:55 +00:00

iax2-provision.h

Don't reload a configuration file if nothing has changed.

2007-08-16 21:09:46 +00:00

iax2.h

Merged revisions 215955 via svnmerge from

2009-09-03 18:41:27 +00:00

Makefile

Merged revisions 207680 via svnmerge from

2009-07-21 13:48:38 +00:00

misdn_config.c

Merged revisions 212506 via svnmerge from

2009-08-17 16:52:12 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

vgrabbers.c

free memory used by the x11 grabber when closing it.

2008-07-14 16:50:54 +00:00