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

diff --git a/CHANGES b/CHANGES
index c085918ee57d26032946c4e35b9ddc69ad8af9a0..e00b3f9c0e4a9c2ce43e2d66e51220c06a30d82d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,9 @@
 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]

diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index a3c81554d809667636d14036ee01eccaad8687e0..fb5fbe160577dedc95819de51ef08a2860051139 100644 (file)
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -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>
 

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index c93e5b1918d6caf05b9dfcdf4a51ccbf58f1a0a4..a184e85f6693fb5c9dd3f1c46b5e3a2af6bc8a1b 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -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>
 

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 66017302e660ac4d5af1abf74178b8fa67a6d441..0fcbd5228310431b235e9f66110e6675184eeffd 100644 (file)
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -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 "

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 304516021be5e3b2e8a533a557f38a7b924dc25b..a28d3bafa5d40b606bcf72c0aac5533dc8d77f7c 100644 (file)
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -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)) {

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 02cebee1fc55515e302dd2ffa0b3b2041ee4b380..fcaa8204e35a98a0f2d0bdfbb7055633ce2a2534 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -260,7 +260,7 @@ typedef enum {
     SSL_SCMODE_DBM   = 1,
     SSL_SCMODE_SHMCB = 3,
     SSL_SCMODE_DC    = 4,
-    SSL_SCMODE_OPENSSL_INTERNAL = 5
+    SSL_SCMODE_NONE_NOT_NULL = 5
 } ssl_scmode_t;
 
 /*