diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-21 18:23:47 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-21 18:23:47 +0000 |
| commit | dfa1012364ea4192c8c050c004a2c999f9be1f5b (patch) | |
| tree | 2e1d2cad1b1b8ab93d3f1476c72519118ae0d6ac /channels | |
| parent | 2bdc7c1284d80a280e35589a72c33872f40898b2 (diff) | |
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)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@258334 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 88e558046..87e183175 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10135,7 +10135,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho } 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); |