Merge 1610311 from trunk:

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

View File

@ -1443,6 +1443,10 @@ static apr_status_t ssl_init_server_ctx(server_rec *s,
}
#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;
}