[asterisk-commits] branch oej/subscribemwi-1.2 r13063 - in /team/oej/subscribemwi-1.2: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Mar 15 08:15:01 2006
New Revision: 13063

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

Modified:
    team/oej/subscribemwi-1.2/   (props changed)
    team/oej/subscribemwi-1.2/channels/chan_sip.c

Propchange: team/oej/subscribemwi-1.2/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training

Propchange: team/oej/subscribemwi-1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 15 08:15:01 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-12953
+/branches/1.2:1-13062

Modified: team/oej/subscribemwi-1.2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/subscribemwi-1.2/channels/chan_sip.c?rev=13063&r1=13062&r2=13063&view=diff
==============================================================================
--- team/oej/subscribemwi-1.2/channels/chan_sip.c (original)
+++ team/oej/subscribemwi-1.2/channels/chan_sip.c Wed Mar 15 08:15:01 2006
@@ -10698,6 +10698,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 */
@@ -10727,6 +10728,12 @@
 	} else if (debug && ignore)
 		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 */