VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1610311 from trunk:

Browse Source 
Extend the scope of SSLSessionCacheTimeout to sessions
resumed by TLS session resumption (RFC 5077).

Submitted by: rjung
Reviewed by: rjung, ylavic, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1610399 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2014-07-14 12:29:22 +00:00
parent f77f71023c
commit 597ba51815
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -2,6 +2,9 @@
Changes with Apache 2.4.10 Changes with Apache 2.4.10
*) mod_ssl: Extend the scope of SSLSessionCacheTimeout to sessions
resumed by TLS session resumption (RFC 5077). [Rainer Jung]
*) mod_deflate: Don't fail when flushing inflated data to the user-agent *) mod_deflate: Don't fail when flushing inflated data to the user-agent
and that coincides with the end of stream ("Zlib error flushing inflate and that coincides with the end of stream ("Zlib error flushing inflate
buffer"). PR 56196. [Christoph Fausak <christoph fausak glueckkanja.com>] buffer"). PR 56196. [Christoph Fausak <christoph fausak glueckkanja.com>]

3
docs/manual/mod/mod_ssl.xml
View File

@ -505,7 +505,8 @@ in the Session Cache</description>
<usage> <usage>
<p> <p>
This directive sets the timeout in seconds for the information stored in the This directive sets the timeout in seconds for the information stored in the
global/inter-process SSL Session Cache and the OpenSSL internal memory cache. global/inter-process SSL Session Cache, the OpenSSL internal memory cache and
for sessions resumed by TLS session resumption (RFC 5077).
It can be set as low as 15 for testing, but should be set to higher It can be set as low as 15 for testing, but should be set to higher
values like 300 in real life.</p> values like 300 in real life.</p>
<example><title>Example</title> <example><title>Example</title>

4
modules/ssl/ssl_engine_init.c
View File

@ -1443,6 +1443,10 @@ static apr_status_t ssl_init_server_ctx(server_rec *s,
} }
#endif #endif
SSL_CTX_set_timeout(sc->server->ssl_ctx,
sc->session_cache_timeout == UNSET ?
SSL_SESSION_CACHE_TIMEOUT : sc->session_cache_timeout);
return APR_SUCCESS; return APR_SUCCESS;
} }