summaryrefslogtreecommitdiff
path: root/modules/ssl
diff options
context:
space:
mode:
authorMadhusudan Mathihalli <madhum@apache.org>2004-03-26 23:53:35 +0000
committerMadhusudan Mathihalli <madhum@apache.org>2004-03-26 23:53:35 +0000
commitb9164cbc0b4124657d8f126fa833fc4a2867254f (patch)
tree39592cb35e059d2c5fe05a3f8aa58242496cfcc7 /modules/ssl
parent8f26402223dbafa8ec4bbcb721081f9fc05cdb08 (diff)
downloadhttpd-b9164cbc0b4124657d8f126fa833fc4a2867254f.tar.gz
In the newer versions of OpenSSL, the flag SSL_SESS_CACHE_NO_INTERNAL_LOOKUP
just prevents the internal lookup but does not prevent the caching. OpenSSL 0.9.6h onwards has a new flag 'SSL_SESS_CACHE_NO_INTERNAL' to prevent OpenSSL from both lookup and caching the sessions internally. PR: 26562 Reviewed by: Geoff Thorpe, Joe Orton git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103165 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl')
-rw-r--r--modules/ssl/ssl_engine_init.c4
-rw-r--r--modules/ssl/ssl_toolkit_compat.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 95d3b5be58..e2c29b448b 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -446,11 +446,11 @@ static void ssl_init_ctx_session_cache(server_rec *s,
long cache_mode = SSL_SESS_CACHE_OFF;
if (mc->nSessionCacheMode != SSL_SCMODE_NONE) {
- /* SSL_SESS_CACHE_NO_INTERNAL_LOOKUP will force OpenSSL
+ /* SSL_SESS_CACHE_NO_INTERNAL will force OpenSSL
* to ignore process local-caching and
* to always get/set/delete sessions using mod_ssl's callbacks.
*/
- cache_mode = SSL_SESS_CACHE_SERVER|SSL_SESS_CACHE_NO_INTERNAL_LOOKUP;
+ cache_mode = SSL_SESS_CACHE_SERVER|SSL_SESS_CACHE_NO_INTERNAL;
}
SSL_CTX_set_session_cache_mode(ctx, cache_mode);
diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index 8e14042990..367e12e60d 100644
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -223,4 +223,8 @@ typedef void (*modssl_popfree_fn)(char *data);
SSL_set_verify(ssl, verify, cb)
#endif
+#ifndef SSL_SESS_CACHE_NO_INTERNAL
+#define SSL_SESS_CACHE_NO_INTERNAL SSL_SESS_CACHE_NO_INTERNAL_LOOKUP
+#endif
+
#endif /* SSL_TOOLKIT_COMPAT_H */