[asterisk-commits] russell: branch 1.6.0 r114241 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Apr 17 18:09:10 2008
New Revision: 114241

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

................
r114151 | oej | 2008-04-15 15:39:29 -0500 (Tue, 15 Apr 2008) | 10 lines

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

........
r114148 | oej | 2008-04-15 22:26:05 +0200 (Tis, 15 Apr 2008) | 2 lines

Handle subscribe queues in all situations... Thanks to festr_ on irc for telling me about this bug.

........

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

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=114241&r1=114240&r2=114241
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Apr 17 18:09:10 2008
@@ -15410,6 +15410,11 @@
 				} else {
 					if (!p->subscribed && !p->refer)
 						p->needdestroy = 1;
+					if (ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE)) {
+						/* Ready to send the next state we have on queue */
+						ast_clear_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE);
+						cb_extensionstate((char *)p->context, (char *)p->exten, p->laststate, (void *) p);
+					}
 				}
 			} else if (sipmethod == SIP_BYE)
 				p->needdestroy = 1;