Automerge script 7a7f9cba43 Merged revisions 377911 via svnmerge from ...

file:///srv/subversion/repos/asterisk/trunk

................
  r377911 | mmichelson | 2012-12-11 18:02:31 -0600 (Tue, 11 Dec 2012) | 22 lines
  
  Fix a potential deadlock in chan_sip during transfers.
  
  The issue comes from the fact that transfers may perform
  a redirecting update on a channel. The issue is that lock
  inversion between the channel and its tech_pvt occurs since
  the channel lock is released during the transfer process.
  
  The fix is to move when the redirecting update occurs to a
  place where neither the tech_pvt or the channel is locked so
  that the two can be locked in the proper order.
  
  (closes issue ASTERISK-20708)
  reported by Mark Michelson
  patches:
  	ASTERISK-20708-3.patch uploaded by Mark Michelson (License #5049)
  
  Tested by:
  	Tim Ringenbach at Asteria Solutions Group
  ........
  
  Merged revisions 377910 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377912 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2012-12-12 00:17:36 +00:00

..

h323

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

misdn

Merged revisions 376953 via svnmerge from

2012-11-30 22:19:35 +00:00

sip

Merged revisions 376551 via svnmerge from

2012-11-20 19:19:31 +00:00

chan_agent.c

Multiple revisions 375993-375994

2012-11-07 19:15:26 +00:00

chan_alsa.c

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

chan_bridge.c

Finalize ast_channel opaquification

2012-03-13 18:20:34 +00:00

chan_console.c

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

chan_dahdi.c

Multiple revisions 375993-375994

2012-11-07 19:15:26 +00:00

chan_gtalk.c

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

chan_h323.c

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

chan_iax2.c

Merged revisions 376575 via svnmerge from

2012-11-21 19:20:22 +00:00

chan_jingle.c

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

chan_local.c

Merged revisions 376867,376871 via svnmerge from

2012-11-29 23:19:44 +00:00

chan_mgcp.c

Make evaluation of channel variables consistently case-sensitive.

2012-10-29 21:27:09 +00:00

chan_misdn.c

Things don't need to be that const.

2012-11-02 21:01:33 +00:00

chan_motif.c

Merged revisions 377463 via svnmerge from

2012-12-09 02:20:13 +00:00

chan_multicast_rtp.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

chan_nbs.c

Opaquification for ast_format structs in struct ast_channel

2012-02-24 00:32:20 +00:00

chan_oss.c

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

chan_phone.c

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

chan_phone.h

…

chan_sip.c

Merged revisions 377911 via svnmerge from

2012-12-12 00:17:36 +00:00

chan_skinny.c

Fix for chan_skinny leaving RTP ports open

2012-11-02 21:03:56 +00:00

chan_unistim.c

Merged revisions 377594-377595 via svnmerge from

2012-12-10 07:19:34 +00:00

chan_vpb.cc

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

console_board.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

console_gui.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

console_video.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

console_video.h

…

iax2-parser.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

iax2-parser.h

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

iax2-provision.c

iax2-provision: Fix improper return on failed cache retrieval

2012-09-21 19:35:37 +00:00

iax2-provision.h

…

iax2.h

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

Makefile

Doxygen Updates - Title update

2012-10-14 21:47:40 +00:00

misdn_config.c

Add named callgroups/pickupgroups

2012-08-07 12:46:36 +00:00

sig_analog.c

Multiple revisions 375993-375994

2012-11-07 19:15:26 +00:00

sig_analog.h

Convert sig_analog to use a global callback table.

2012-08-08 20:32:53 +00:00

sig_pri.c

Multiple revisions 375993-375994

2012-11-07 19:15:26 +00:00

sig_pri.h

Clean up doxygen warnings

2012-08-30 14:23:28 +00:00

sig_ss7.c

Merged revisions 376061 via svnmerge from

2012-11-08 21:19:33 +00:00

sig_ss7.h

Convert sig_ss7 to use a global callback table.

2012-08-08 00:15:54 +00:00

vcodecs.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00

vgrabbers.c

Multiple revisions 369001-369002

2012-06-15 16:20:16 +00:00