You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/08/05 17:03:08 UTC
svn commit: r1510527 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/ssl/ssl_engine_kernel.c
Author: jim
Date: Mon Aug 5 15:03:08 2013
New Revision: 1510527
URL: http://svn.apache.org/r1510527
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1510098
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1510527&r1=1510526&r2=1510527&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Aug 5 15:03:08 2013
@@ -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:
Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c?rev=1510527&r1=1510526&r2=1510527&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_kernel.c Mon Aug 5 15:03:08 2013
@@ -1687,7 +1687,7 @@ static void ssl_session_log(server_rec *
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,