disable dialog matching for subscribe reqs so it always uses a new handle to avoid...

Conflicts:
	libs/sofia-sip/.update

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 09f883d7d8e493e06dc2da8c7f8797f70899d909..33ee7e540dca5f9ba58fdcd92cee8b764006a5a3 100644 (file)
--- 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 f68cbeaddf43819d36e65bcf98cba7712d703893..f5d61e453030dfc0fd214d7ba27d6135c7b66d7c 100644 (file)
--- 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,