[asterisk-commits] dvossel: branch 1.6.2 r284704 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Sep  2 11:48:51 2010
New Revision: 284704

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=284704
Log:
Merged revisions 284703 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r284703 | dvossel | 2010-09-02 11:47:15 -0500 (Thu, 02 Sep 2010) | 7 lines
  
  Removed relatedpeer code from sip_autodestruct
  
  Handling of the relatedpeer structure associated with a
  sip_pvt should be done during the final sip_destruction
  function, not in sip_autodestruct.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_sip.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Sep  2 11:48:51 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893,283048,283123,283380,283690,283880,283960,284316,284393,284478
+/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893,283048,283123,283380,283690,283880,283960,284316,284393,284478,284703

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=284704&r1=284703&r2=284704
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Thu Sep  2 11:48:51 2010
@@ -4003,10 +4003,6 @@
 			__sip_pretend_ack(p);
 		}
 	}
-
-	if (p->subscribed == MWI_NOTIFICATION)
-		if (p->relatedpeer)
-			p->relatedpeer = unref_peer(p->relatedpeer, "__sip_autodestruct: unref peer p->relatedpeer");	/* Remove link to peer. If it's realtime, make sure it's gone from memory) */
 
 	/* Reset schedule ID */
 	p->autokillid = -1;