From: Jonathan Rose <jrose@digium.com>
Date: Thu, 17 May 2012 14:42:49 +0000 (+0000)
Subject: Blocked revisions 366792
X-Git-Tag: 11.0.0-beta1~311
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e240b2159acc159a531fc8398e67a1755084eae0;p=thirdparty%2Fasterisk.git

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


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