[asterisk-commits] mmichelson: branch 1.6.0 r208316 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jul 23 11:30:00 2009
New Revision: 208316

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=208316
Log:
Merged revisions 208314 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r208314 | mmichelson | 2009-07-23 11:29:37 -0500 (Thu, 23 Jul 2009) | 9 lines
  
  Merged revisions 208312 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r208312 | mmichelson | 2009-07-23 11:29:18 -0500 (Thu, 23 Jul 2009) | 3 lines
    
    Remove inaccurate XXX comment.
  ........
................

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.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=208316&r1=208315&r2=208316
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Jul 23 11:30:00 2009
@@ -15647,10 +15647,6 @@
 			/* Alcatel PBXs are known to send 183s with no SDP after sending
 			 * a 100 Trying response. We're just going to treat this sort of thing
 			 * the same as we would treat a 180 Ringing
-			 */
-			/*XXX I'm just following the same procedure for a 180 response, which
-			 * doesn't change the invitestate of p. Shouldn't it be INV_PROCEEDING
-			 * though?
 			 */
 			if (!req->ignore && p->owner) {
 				ast_queue_control(p->owner, AST_CONTROL_RINGING);