httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r724789 - /httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
Date Tue, 09 Dec 2008 17:26:50 GMT
Author: jorton
Date: Tue Dec  9 09:26:50 2008
New Revision: 724789

URL: http://svn.apache.org/viewvc?rev=724789&view=rev
Log:
* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLSessionCache): Don't fix
  the socache instance for the lifetime of the process since it is
  allocated out of pconf.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?rev=724789&r1=724788&r2=724789&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Tue Dec  9 09:26:50 2008
@@ -956,10 +956,6 @@
         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 @@
             /* 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;



Mime
View raw message