[svn-commits] jrose: trunk r366793 - /trunk/

[SVN commits to the Digium repositories]

Author: jrose
Date: Thu May 17 09:42:49 2012
New Revision: 366793

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=366793
Log:
Blocked revisions 366792

........
chan_sip: Fix missed locking of opposing pvt for directmedia acl from r366547

It also required deadlock avoidance since two sip_pvts structs needed to be
locked simultaneously. Trunk handles it differently, so this is a 1.8 and 10
patch only.
........

Merged revisions 366791 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-10-blocked (original)
+++ branch-10-blocked Thu May 17 09:42:49 2012
@@ -1,1 +1,1 @@
-/branches/10:330492,330514,337433,337640,338493,352288,352616,356431,359054,360476,365014
+/branches/10:330492,330514,337433,337640,338493,352288,352616,356431,359054,360476,365014,366792