Commit c52a9933 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Good suggestion from a private Email. name changes. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@209827 13f79535-47bb-0310-9956-ffa450edef68
parent 635eb73e

CHANGES

+3 −5
Changes for CHANGES: 3 added lines, 5 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.1.7

  [Remove entries to the current 2.0 section below, when backported]









  *) Add additional SSLSessionCache option, 'internal', which makes









     mod_ssl just use OpenSSL's own internal session ID cache. Useful









     when one needs to disable any external, shared caches but









     requires the server to send non-null session IDs.









     [Jim Jagielski]









  *) Add additional SSLSessionCache option, 'nonenotnull', which is









     similar to 'none' (disabling any external shared cache) but forces









     OpenSSL to provide a non-null session ID.  [Jim Jagielski]

















  *) Add httxt2dbm to support/ for creating RewriteMap DBM Files.









     [Paul Querna]


































docs/manual/mod/mod_ssl.html.en



+3
−4



























Changes for docs/manual/mod/mod_ssl.html.en: 3 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -1532,12 +1532,11 @@ The following four storage <em>type</em>s are currently supported:</p>







    using certain browsers, particularly if client certificates are









    enabled.  This setting is not recommended.</p></li>



















<li><code>internal</code>









<li><code>nonenotnull</code>



















    <p>This disables any global/inter-process Session Cache.  However









    it does allow OpenSSL to use its own internal session cache. This in









    mainly useful in situations where a global cache cannot be used









    but the client requires a non-null session ID.</p></li>









    it does force OpenSSL to send a non-null session ID to









    accommodate buggy clients that require one.</p></li>



















<li><code>dbm:/path/to/datafile</code>












































docs/manual/mod/mod_ssl.xml



+3
−4



























Changes for docs/manual/mod/mod_ssl.xml: 3 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -412,12 +412,11 @@ The following four storage <em>type</em>s are currently supported:</p>







    using certain browsers, particularly if client certificates are









    enabled.  This setting is not recommended.</p></li>



















<li><code>internal</code>









<li><code>nonenotnull</code>



















    <p>This disables any global/inter-process Session Cache.  However









    it does allow OpenSSL to use its own internal session cache. This in









    mainly useful in situations where a global cache cannot be used









    but the client requires a non-null session ID.</p></li>









    it does force OpenSSL to send a non-null session ID to









    accommodate buggy clients that require one.</p></li>



















<li><code>dbm:/path/to/datafile</code>












































modules/ssl/mod_ssl.c



+1
−1



























Changes for modules/ssl/mod_ssl.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -83,7 +83,7 @@ static const command_rec ssl_config_cmds[] = {







                "or `exec:/path/to/cgi_program')")









    SSL_CMD_SRV(SessionCache, TAKE1,









                "SSL Session Cache storage "









                "(`none', `internal', `dbm:/path/to/file')")









                "(`none', `nonenotnull', `dbm:/path/to/file')")









#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)









    SSL_CMD_SRV(CryptoDevice, TAKE1,









                "SSL external Crypto Device usage "


































modules/ssl/ssl_engine_config.c



+2
−2



























Changes for modules/ssl/ssl_engine_config.c: 2 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -1001,8 +1001,8 @@ const char *ssl_cmd_SSLSessionCache(cmd_parms *cmd,







        mc->nSessionCacheMode      = SSL_SCMODE_NONE;









        mc->szSessionCacheDataFile = NULL;









    }









    else if (strcEQ(arg, "internal")) {









        mc->nSessionCacheMode      = SSL_SCMODE_OPENSSL_INTERNAL;









    else if (strcEQ(arg, "nonenotnull")) {









        mc->nSessionCacheMode      = SSL_SCMODE_NONE_NOT_NULL;









        mc->szSessionCacheDataFile = NULL;









    }









    else if ((arglen > 4) && strcEQn(arg, "dbm:", 4)) {