comment out optional Require header from re-invites for the sake of interop with...

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 79031274b7fff907a2166e39596308ab7e609f4f..91012691252a7f7b2e89a96a67981ba9f5f84df1 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Nov  2 08:58:40 CDT 2011
+Tue Nov 22 18:16:53 CST 2011

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
index bc80310f23b80057d89c5a24043fe31668078ed5..1958b5645a38fa84fd80a562116771bf9363d89f 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
@@ -4486,14 +4486,13 @@ session_timer_add_headers(struct session_timer *t,
     return 1;
 
   sip_add_tl(msg, sip,
-            TAG_IF(expires != 0, SIPTAG_SESSION_EXPIRES(x)),
-            TAG_IF(min != 0
-                   /* Min-SE: 0 is optional with initial INVITE */
-                   || !initial,
-                   SIPTAG_MIN_SE(min_se)),
-            TAG_IF(refresher == nua_remote_refresher && expires != 0,
-                   SIPTAG_REQUIRE_STR("timer")),
-            TAG_END());
+                        TAG_IF(expires != 0, SIPTAG_SESSION_EXPIRES(x)),
+                        TAG_IF(min != 0
+                                       /* Min-SE: 0 is optional with initial INVITE */
+                                       || !initial,
+                                       SIPTAG_MIN_SE(min_se)),
+                        //TAG_IF(refresher == nua_remote_refresher && expires != 0, SIPTAG_REQUIRE_STR("timer")),
+                        TAG_END());
 
   return 1;
 }

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 7d37776f697c4c1c6b9aa7e8792b2668e52513f3..f416c0fff0744d45f7fe997356ffef820929aadc 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -5412,3 +5412,4 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sofia_shutdown)
  * For VIM:
  * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
  */
+