]> granicus.if.org Git - apache/commit
Merge 1610311 from trunk:
authorJoe Orton <jorton@apache.org>
Mon, 14 Jul 2014 12:29:22 +0000 (12:29 +0000)
committerJoe Orton <jorton@apache.org>
Mon, 14 Jul 2014 12:29:22 +0000 (12:29 +0000)
commit597ba51815466a0c0b68243c28b1a9c71dba5035
treea3fa344dd2b28152d353315afa03ca2aacda78f9
parentf77f71023c9e28db194a35d4de9ec2b763074da4
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
CHANGES
docs/manual/mod/mod_ssl.xml
modules/ssl/ssl_engine_init.c