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

diff --git a/STATUS b/STATUS
index b7cba4254b7ba0e674ab7a8a518e88aa9cda560a..8a558727af03e24b665946c7c94efe1ca4c4483b 100644 (file)
--- 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 a088df166fcb9d4316cb1131a3702a6578e4029a..05fd2ac01c8e73d3b2acfe90bd48a31df684c7b8 100644 (file)
--- 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,