diff options
author | Joe Orton <jorton@apache.org> | 2008-12-09 17:26:50 +0000 |
---|---|---|
committer | Joe Orton <jorton@apache.org> | 2008-12-09 17:26:50 +0000 |
commit | 61d7e254c9c025c4da937fd05196aa14268082c2 (patch) | |
tree | 6182d74c9cf56c9b568d49ccf469245ce388c614 | |
parent | 172d5634554acceb8c311a0b8dfd4080650d0d99 (diff) | |
download | httpd-61d7e254c9c025c4da937fd05196aa14268082c2.tar.gz |
* 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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724789 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | modules/ssl/ssl_engine_config.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index 8f792c565a..e14ab78350 100644 --- a/modules/ssl/ssl_engine_config.c +++ b/modules/ssl/ssl_engine_config.c @@ -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; |