From 9a87ec6a52dbdf9203ea48a344055407327e45a6 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 12 Jun 2013 23:46:47 -0500 Subject: [PATCH] disable dialog matching for subscribe reqs so it always uses a new handle to avoid conflicting with notify transactions Conflicts: libs/sofia-sip/.update --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/nta/nta.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 09f883d7d8..33ee7e540d 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Thu Apr 25 12:15:59 CDT 2013 +Wed Jun 12 23:48:20 CDT 2013 diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c index f68cbeaddf..f5d61e4530 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c +++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c @@ -2989,7 +2989,7 @@ void agent_recv_request(nta_agent_t *agent, url->url_params = NULL; agent_aliases(agent, url, tport); /* canonize urls */ - if ((leg = leg_find(agent, + if (method != sip_method_subscribe && (leg = leg_find(agent, method_name, url, sip->sip_call_id, sip->sip_from->a_tag,