[asterisk-commits] branch oej/test-this-branch r13064 - in /team/oej/test-this-branch: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Mar 15 08:20:19 2006
New Revision: 13064

URL: http://svn.digium.com/view/asterisk?rev=13064&view=rev
Log:
Resolve merge conflict, reset automerge

Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/channels/chan_sip.c

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 15 08:20:19 2006
@@ -1,1 +1,1 @@
-/trunk:1-13016
+/trunk:1-13063

Modified: team/oej/test-this-branch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_sip.c?rev=13064&r1=13063&r2=13064&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Wed Mar 15 08:20:19 2006
@@ -10972,6 +10972,7 @@
 	struct sip_peer *authpeer = NULL;
 	char *event = get_header(req, "Event");	/* Get Event package name */
 	char *accept = get_header(req, "Accept");
+	char *eventparam;
 
 	if (p->initreq.headers) {	
 		/* We already have a dialog */
@@ -11012,6 +11013,12 @@
 		ast_verbose("Ignoring this SUBSCRIBE request\n");
 
 
+	/* Find parameters to Event: header value and remove them for now */
+	eventparam = strchr(event, ";");
+	if (eventparam) {
+		*eventparam = '\0';
+		eventparam++;
+	}
 
 	/* Handle authentication if this is our first subscribe */
 	res = check_user_full(p, req, SIP_SUBSCRIBE, e, 0, sin, ignore, &authpeer);