From 0d3db88c5b467b153e759fd8f6b27c7257ab71b2 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 15 May 2009 15:43:28 +0000 Subject: [PATCH] Tue May 12 12:08:13 CDT 2009 Pekka Pessi * 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 --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 9f4e607b94..d7aeb92043 100644 --- 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 ec9997a690..50a983b9db 100644 --- 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;