[asterisk-commits] oej: trunk r66502 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue May 29 14:17:49 2007
New Revision: 66502

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

........
r66474 | oej | 2007-05-29 21:02:04 +0200 (Tue, 29 May 2007) | 2 lines

Don't issue hangup on hangup on hangup on hangup (for jcmoore)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=66502&r1=66501&r2=66502
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue May 29 14:17:49 2007
@@ -13371,7 +13371,7 @@
 					break;
 				default:
 					/* Send hangup */	
-					if (owner && sipmethod != SIP_MESSAGE && sipmethod != SIP_INFO)
+					if (owner && sipmethod != SIP_MESSAGE && sipmethod != SIP_INFO && sipmethod != SIP_BYE)
 						ast_queue_hangup(p->owner);
 					break;
 				}