[asterisk-commits] file: branch 1.4 r71430 - in /branches/1.4: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Sun Jun 24 20:10:06 2007
New Revision: 71430

URL: http://svn.digium.com/view/asterisk?view=rev&rev=71430
Log:
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)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/channels/chan_sip.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=71430&r1=71429&r2=71430
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Sun Jun 24 20:10:06 2007
@@ -11638,10 +11638,12 @@
 static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req)
 {
 	char tmp[BUFSIZ];
-	char *s, *e, *uri;
+	char *s, *e, *uri, *t;
 	char *domain;
 
 	ast_copy_string(tmp, get_header(req, "Contact"), sizeof(tmp));
+	if ((t = strchr(tmp, ',')))
+		*t = '\0';
 	s = get_in_brackets(tmp);
 	uri = ast_strdupa(s);
 	if (ast_test_flag(&p->flags[0], SIP_PROMISCREDIR)) {