From 6892b84dc21561a43ba4a24830bd4c8f10c65dee Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 5 Aug 2013 15:03:08 +0000 Subject: [PATCH] Merge r1510098 from trunk: Fix logging of SSL session cache timeout value (at TRACE2 level). Inadvertent side effect of r907918, where the timeout calculation in ssl_callback_NewSessionCacheEntry was slightly modified. Submitted by: kbrand Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1510527 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 5 ----- modules/ssl/ssl_engine_kernel.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/STATUS b/STATUS index b7cba4254b..8a558727af 100644 --- a/STATUS +++ b/STATUS @@ -93,11 +93,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_ssl: Fix logging of SSL session cache timeout value - trunk patch: https://svn.apache.org/r1510098 - 2.4.x patch: trunk patch works - +1: kbrand, trawick, jim - PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index a088df166f..05fd2ac01c 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -1687,7 +1687,7 @@ static void ssl_session_log(server_rec *s, if (timeout) { apr_snprintf(timeout_str, sizeof(timeout_str), - "timeout=%lds ", (timeout - time(NULL))); + "timeout=%lds ", timeout); } ap_log_error(APLOG_MARK, APLOG_TRACE2, 0, s, -- 2.40.0