[svn-commits] russell: branch 1.6.0 r115563 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu May  8 11:14:53 2008
New Revision: 115563

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

................
r115562 | russell | 2008-05-08 11:14:08 -0500 (Thu, 08 May 2008) | 11 lines

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

........
r115561 | russell | 2008-05-08 11:11:33 -0500 (Thu, 08 May 2008) | 3 lines

Don't give up on attempting an outbound registration if we receive a 408 Timeout.
(closes issue #12323)

........

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

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=115563&r1=115562&r2=115563
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu May  8 11:14:53 2008
@@ -14933,8 +14933,6 @@
 		}
 		break;
 	case 408:	/* Request timeout */
-		if (global_regattempts_max)
-			p->registry->regattempts = global_regattempts_max+1;
 		p->needdestroy = 1;
 		r->call = NULL;
 		AST_SCHED_DEL(sched, r->timeout);