]> granicus.if.org Git - apache/commitdiff
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLSessionCache): Don't fix
authorJoe Orton <jorton@apache.org>
Tue, 9 Dec 2008 17:26:50 +0000 (17:26 +0000)
committerJoe Orton <jorton@apache.org>
Tue, 9 Dec 2008 17:26:50 +0000 (17:26 +0000)
  the socache instance for the lifetime of the process since it is
  allocated out of pconf.

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

modules/ssl/ssl_engine_config.c

index 8f792c565a4d20c007032f9303addd0d2964c002..e14ab78350871567d8d49da8b1b068e7c8efcd9e 100644 (file)
@@ -956,10 +956,6 @@ const char *ssl_cmd_SSLSessionCache(cmd_parms *cmd,
         return err;
     }
 
-    if (ssl_config_global_isfixed(mc)) {
-        return NULL;
-    }
-
     /* The OpenSSL session cache mode must have both the flags
      * SSL_SESS_CACHE_SERVER and SSL_SESS_CACHE_NO_INTERNAL set if a
      * session cache is configured; NO_INTERNAL prevents the
@@ -989,7 +985,7 @@ const char *ssl_cmd_SSLSessionCache(cmd_parms *cmd,
             /* Cache found; create it, passing anything beyond the colon. */
             mc->sesscache_mode = enabled_flags;
             err = mc->sesscache->create(&mc->sesscache_context, sep + 1, 
-                                        cmd->pool, mc->pPool);
+                                        cmd->temp_pool, cmd->pool);
         }
         else {
             apr_array_header_t *name_list;