[asterisk-commits] twilson: branch 1.6.1 r139874 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Aug 25 16:13:22 2008
New Revision: 139874

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

................
r139870 | twilson | 2008-08-25 15:59:58 -0500 (Mon, 25 Aug 2008) | 10 lines

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

........
r139869 | twilson | 2008-08-25 15:46:10 -0500 (Mon, 25 Aug 2008) | 2 lines

Make SIPADDHEADER() propagate indefinitely

........

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

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://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=139874&r1=139873&r2=139874
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Mon Aug 25 16:13:22 2008
@@ -22281,10 +22281,10 @@
 	/* Check for headers */
 	while (!ok && no <= 50) {
 		no++;
-		snprintf(varbuf, sizeof(varbuf), "_SIPADDHEADER%.2d", no);
-
-		/* Compare without the leading underscore */
-		if( (pbx_builtin_getvar_helper(chan, (const char *) varbuf + 1) == (const char *) NULL) )
+		snprintf(varbuf, sizeof(varbuf), "__SIPADDHEADER%.2d", no);
+
+		/* Compare without the leading underscores */
+		if( (pbx_builtin_getvar_helper(chan, (const char *) varbuf + 2) == (const char *) NULL) )
 			ok = TRUE;
 	}
 	if (ok) {