Tue May 12 12:08:13 CDT 2009 Pekka Pessi <first.last@nokia.com>

  * nua_session.c: include Session-Expires to session refresh requests

  Thanks for Linus Surguy for reporting the problem.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13318 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 9f4e607b94a263e18db47124e7c1303b41b15bf8..d7aeb9204378a0c3a2c81e174c1e1a820accdd35 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Fri May 15 10:42:15 CDT 2009
+Fri May 15 10:43:02 CDT 2009

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 ec9997a690db4ff98342eb2c256536263b8fa48f..50a983b9dbade58d310d4f3ccd49c08a5b560270 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
@@ -4393,10 +4393,15 @@ session_timer_add_headers(struct session_timer *t,
      */
     if (t->local.refresher == nua_local_refresher)
       refresher = nua_local_refresher;
+    else if (!initial)
+      refresher = t->refresher;
 
     expires = t->local.expires;
     if (expires != 0 && expires < min)
       expires = min;
+
+    if (expires == 0 && !initial && t->interval)
+      expires = t->interval;
   }
 
   sip_min_se_init(min_se)->min_delta = min;