You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/04/15 21:54:52 UTC
cvs commit: httpd-2.0/modules/ssl ssl_engine_init.c ssl_toolkit_compat.h
jorton 2004/04/15 12:54:52
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
modules/ssl Tag: APACHE_2_0_BRANCH ssl_engine_init.c
ssl_toolkit_compat.h
Log:
* modules/ssl/ssl_engine_init.c (ssl_init_ctx_session_cache): Disable
all OpenSSL-internal session caching.
* modules/ssl/ssl_toolkit_compat.h: Define SSL_SESS_CACHE_NO_INTERNAL
as SSL_SESS_CACHE_NO_INTERNAL_LOOKUP if necessary.
PR: 26562
Submitted by: Madhusudan Mathihalli
Reviewed by: Joe Orton, Jeff Trawick
Revision Changes Path
No revision
No revision
1.988.2.267 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.266
retrieving revision 1.988.2.267
diff -w -d -u -r1.988.2.266 -r1.988.2.267
--- CHANGES 15 Apr 2004 19:41:37 -0000 1.988.2.266
+++ CHANGES 15 Apr 2004 19:54:49 -0000 1.988.2.267
@@ -1,5 +1,8 @@
Changes with Apache 2.0.50
+ *) mod_ssl: Fix memory leak in session cache handling. PR 26562
+ [Madhusudan Mathihalli]
+
*) mod_ssl: Fix potential segfaults when performing SSL shutdown from
a pool cleanup. PR 27945. [Joe Orton]
1.751.2.819 +1 -7 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.818
retrieving revision 1.751.2.819
diff -w -d -u -r1.751.2.818 -r1.751.2.819
--- STATUS 15 Apr 2004 19:41:38 -0000 1.751.2.818
+++ STATUS 15 Apr 2004 19:54:49 -0000 1.751.2.819
@@ -155,12 +155,6 @@
modules/mappers/mod_alias.c: r1.45, 1.46, 1.47, 1.48, 1.55
+1: nd
- *) mod_ssl: Disable the extra session caching in OpenSSL to prevent
- memory leak. PR: 26562.
- modules/ssl/ssl_engine_init.c: r1.127
- modules/ssl/ssl_toolkit_compat.h: r1.41
- +1: madhum, jorton, trawick
-
*) Fixed mean and median calculations in ab, also changed where time values
are set for start and connect when doing keep alive benchmarking.
support/ab.c: r1.143
No revision
No revision
1.106.2.12 +2 -2 httpd-2.0/modules/ssl/ssl_engine_init.c
Index: ssl_engine_init.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
retrieving revision 1.106.2.11
retrieving revision 1.106.2.12
diff -w -d -u -r1.106.2.11 -r1.106.2.12
--- ssl_engine_init.c 9 Feb 2004 20:53:20 -0000 1.106.2.11
+++ ssl_engine_init.c 15 Apr 2004 19:54:51 -0000 1.106.2.12
@@ -449,11 +449,11 @@
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);
1.27.2.6 +4 -0 httpd-2.0/modules/ssl/ssl_toolkit_compat.h
Index: ssl_toolkit_compat.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_toolkit_compat.h,v
retrieving revision 1.27.2.5
retrieving revision 1.27.2.6
diff -w -d -u -r1.27.2.5 -r1.27.2.6
--- ssl_toolkit_compat.h 9 Feb 2004 20:53:20 -0000 1.27.2.5
+++ ssl_toolkit_compat.h 15 Apr 2004 19:54:51 -0000 1.27.2.6
@@ -206,4 +206,8 @@
#define HAVE_SSL_X509V3_H
#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 */