[Asterisk-cvs] asterisk/channels chan_sip.c,1.397,1.398

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv29956/channels

Modified Files:
	chan_sip.c 
Log Message:
Cancel destroy request on new invite, merge bkw's control playback changes


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -d -r1.397 -r1.398
--- chan_sip.c	26 May 2004 18:46:36 -0000	1.397
+++ chan_sip.c	26 May 2004 22:18:59 -0000	1.398
@@ -6334,6 +6334,7 @@
 			/* Use this as the basis */
 			if (sip_debug_test_pvt(p))
 				ast_verbose("Using latest request as basis request\n");
+			sip_cancel_destroy(p);
 			/* This call is no longer outgoing if it ever was */
 			p->outgoing = 0;
 			copy_request(&p->initreq, req);