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)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114023 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

@@ -8615,7 +8615,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
 	}
 
 	/* 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