[svn-commits] file: branch 1.6.1 r162741 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Dec 10 11:54:58 2008
New Revision: 162741

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162741
Log:
Merged revisions 162739 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r162739 | file | 2008-12-10 13:53:09 -0400 (Wed, 10 Dec 2008) | 13 lines
  
  Merged revisions 162738 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r162738 | file | 2008-12-10 13:50:43 -0400 (Wed, 10 Dec 2008) | 6 lines
    
    When a SIP peer unregisters set the expiry time back to 0 so that the 200 OK contains an expires of 0.
    (closes issue #13599)
    Reported by: hjourdain
    Patches:
          chan_sip.c.diff uploaded by hjourdain (license 583)
  ........
................

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

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=162741&r1=162740&r2=162741
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Dec 10 11:54:58 2008
@@ -10463,6 +10463,7 @@
 		peer->useragent[0] = '\0';
 		peer->sipoptions = 0;
 		peer->lastms = 0;
+		pvt->expiry = 0;
 
 		ast_verb(3, "Unregistered SIP '%s'\n", peer->name);