From: Joshua Colp <jcolp@digium.com>
Date: Mon, 25 Jun 2007 01:11:47 +0000 (+0000)
Subject: Merged revisions 71430 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76455dda0301240389d7660ba0f2783e664be041;p=thirdparty%2Fasterisk.git

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

................
r71430 | file | 2007-06-24 21:10:06 -0400 (Sun, 24 Jun 2007) | 10 lines

Merged revisions 71414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r71414 | file | 2007-06-24 21:02:49 -0400 (Sun, 24 Jun 2007) | 2 lines

Ignore other URIs after the first in a 300 Multiple Choice response. (issue #10041 reported by homesick)

........

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


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 06f5943fa0..b5e1c7a384 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12430,10 +12430,12 @@ static struct ast_custom_function sipchaninfo_function = {
 static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req)
 {
 	char tmp[BUFSIZ];
-	char *s, *e;
+	char *s, *e, *t;
 	char *domain;
 
 	ast_copy_string(tmp, get_header(req, "Contact"), sizeof(tmp));
+	if ((t = strchr(tmp, ',')))
+		*t = '\0';
 	s = remove_uri_parameters(get_in_brackets(tmp));
 	if (ast_test_flag(&p->flags[0], SIP_PROMISCREDIR)) {
 		if (!strncasecmp(s, "sip:", 4))