[svn-commits] lmadsen: tag 1.8.5.1 r328421 - in /tags/1.8.5.1: ./ channels/

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Fri Jul 15 10:32:45 2011
New Revision: 328421

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=328421
Log:
Merge 328302 to resolve regression in chan_sip.
Update .version, ChangeLog and remove summary files.

Removed:
    tags/1.8.5.1/asterisk-1.8.5.0-summary.html
    tags/1.8.5.1/asterisk-1.8.5.0-summary.txt
Modified:
    tags/1.8.5.1/.version
    tags/1.8.5.1/ChangeLog
    tags/1.8.5.1/channels/chan_sip.c

Modified: tags/1.8.5.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.5.1/.version?view=diff&rev=328421&r1=328420&r2=328421
==============================================================================
--- tags/1.8.5.1/.version (original)
+++ tags/1.8.5.1/.version Fri Jul 15 10:32:45 2011
@@ -1,1 +1,1 @@
-1.8.5.0
+1.8.5.1

Modified: tags/1.8.5.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.5.1/ChangeLog?view=diff&rev=328421&r1=328420&r2=328421
==============================================================================
--- tags/1.8.5.1/ChangeLog (original)
+++ tags/1.8.5.1/ChangeLog Fri Jul 15 10:32:45 2011
@@ -1,3 +1,13 @@
+2011-07-15  Leif Madsen <lmadsen at digium.com>
+
+	* Asterisk 1.8.5.1 Released.
+
+	* r328302 | rmudgett | 2011-07-14 18:12:06 -0500 (Thu, 14 Jul 2011) | 6 lines
+
+	  Missing SIP pvt and channel unlock in sip_set_rtp_peer().
+	  Regression introduced by -r326144.
+	  Add missing SIP pvt and channel unlock in sip_set_rtp_peer().
+
 2011-07-11  Leif Madsen <lmadsen at digium.com>
 
 	* Asterisk 1.8.5.0 Released.

Modified: tags/1.8.5.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.5.1/channels/chan_sip.c?view=diff&rev=328421&r1=328420&r2=328421
==============================================================================
--- tags/1.8.5.1/channels/chan_sip.c (original)
+++ tags/1.8.5.1/channels/chan_sip.c Fri Jul 15 10:32:45 2011
@@ -28250,7 +28250,9 @@
 	if ((instance || vinstance || tinstance) &&
 		!ast_bridged_channel(chan) &&
 		!sip_cfg.directrtpsetup) {
-			return 0;
+		sip_pvt_unlock(p);
+		ast_channel_unlock(chan);
+		return 0;
 	}
 
 	/*