[svn-commits] tilghman: branch 1.6.0 r126058 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jun 27 17:12:08 2008
New Revision: 126058

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

................
r126057 | tilghman | 2008-06-27 17:10:34 -0500 (Fri, 27 Jun 2008) | 12 lines

Merged revisions 126056 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126056 | tilghman | 2008-06-27 17:01:09 -0500 (Fri, 27 Jun 2008) | 4 lines

When we get a 408 Timeout, don't stop trying to re-register.
(closes issue #12863)
 Reported by: ricvil

........

................

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

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

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=126058&r1=126057&r2=126058
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Fri Jun 27 17:12:08 2008
@@ -15031,9 +15031,8 @@
 		}
 		break;
 	case 408:	/* Request timeout */
-		p->needdestroy = 1;
-		r->call = NULL;
-		AST_SCHED_DEL(sched, r->timeout);
+		/* Got a timeout response, so reset the counter of failed responses */
+		r->regattempts = 0;
 		break;
 	case 423:	/* Interval too brief */
 		r->expiry = atoi(get_header(req, "Min-Expires"));