[asterisk-commits] dvossel: branch 1.6.1 r258334 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Apr 21 13:23:47 2010
New Revision: 258334

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

........
  r258305 | dvossel | 2010-04-21 13:13:36 -0500 (Wed, 21 Apr 2010) | 12 lines
  
  fixes issue with double "sip:" in header field
  
  This is a clear mistake in logic.  Future discussions
  about how to avoid having to handle uri's like this
  should take place in the future, but this fix needs
  to go in for now.
  
  (closes issue #15847)
  Reported by: ebroad
  Patches:
        doublesip.patch uploaded by ebroad (license 878)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=258334&r1=258333&r2=258334
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Apr 21 13:23:47 2010
@@ -10135,7 +10135,7 @@
  	} else {
  		if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { 
  			/* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
-			snprintf(to, sizeof(to), "<%s%s>;tag=%s", (!strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag);
+			snprintf(to, sizeof(to), "<%s%s>;tag=%s", (strncasecmp(p->uri, "sip:", 4) ? "sip:" : ""), p->uri, p->theirtag);
  		} else if (p->options && p->options->vxml_url) {
  			/* If there is a VXML URL append it to the SIP URL */
  			snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url);