[asterisk-commits] file: branch 1.6.0 r114023 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Apr 10 08:30:32 2008
New Revision: 114023

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

................
r114022 | file | 2008-04-10 10:28:30 -0300 (Thu, 10 Apr 2008) | 14 lines

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

........
r114021 | file | 2008-04-10 10:27:11 -0300 (Thu, 10 Apr 2008) | 6 lines

Don't add custom URI options if they don't exist OR they are empty.
(closes issue #12407)
Reported by: homesick
Patches:
      uri_options-1.4.diff uploaded by homesick (license 91)

........

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

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=114023&r1=114022&r2=114023
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Apr 10 08:30:32 2008
@@ -8615,7 +8615,7 @@
 	}
 
 	/* If custom URI options have been provided, append them */
-	if (p->options && p->options->uri_options)
+	if (p->options && !ast_strlen_zero(p->options->uri_options))
 		ast_str_append(&invite, 0, ";%s", p->options->uri_options);
 	
  	/* This is the request URI, which is the next hop of the call