merge mod_ssl 2.6.6

4 files changed, 24 insertions, 2 deletions

diff --git a/usr.sbin/httpd/src/CHANGES.SSL b/usr.sbin/httpd/src/CHANGES.SSL
index 8b7fb23ab27..36d648425ac 100644
--- a/usr.sbin/httpd/src/CHANGES.SSL
+++ b/usr.sbin/httpd/src/CHANGES.SSL
@@ -23,6 +23,25 @@
       / __/ | (_) |
   __ |_____(_)___/____________________________________________
 
+  Changes with mod_ssl 2.6.6 (04-Jul-2000 to 12-Aug-2000)
+
+   *) Fixed experimental HTTPS proxy code: A segfault was
+      produced by an incorrect logging command.
+
+   *) Fixed server restarts: Under non-DSO run-time situation, the 
+      OpenSSL library was shutdown (and never re-initialized) and this 
+      way caused segfaults on server restarts. This affected only 
+      installations where mod_ssl+OpenSSL were built as a static module
+      instead of a DSO. This nasty bug was unfortunately introduced in
+      2.6.5 as a side-effect of an (otherwise correct) memory leak bugfix.
+   
+   *) Upgraded both the user manual sources and the website
+      www.modssl.org from WML 1.6 to WML 2.0 format.
+
+   *) Various typo fixes in user manual.
+
+   *) Typo fix in INSTALL document related to RSAref.
+
   Changes with mod_ssl 2.6.5 (01-May-2000 to 04-Jul-2000)
 
    *) Removed more memory leaks by freeing even more stuff
diff --git a/usr.sbin/httpd/src/modules/ssl/libssl.version b/usr.sbin/httpd/src/modules/ssl/libssl.version
index 0d0fce319b1..54a1790fc32 100644
--- a/usr.sbin/httpd/src/modules/ssl/libssl.version
+++ b/usr.sbin/httpd/src/modules/ssl/libssl.version
@@ -1 +1 @@
-mod_ssl/2.6.5-1.3.12
+mod_ssl/2.6.6-1.3.12
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_ext.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_ext.c
index d2e538492d4..c995320d544 100644
--- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_ext.c
+++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_ext.c
@@ -600,7 +600,8 @@ static int ssl_ext_mp_clientcert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
     sc         = mySrvConfig(s);
     pcerts     = sc->skProxyClientCerts;
 
-    ssl_log(s, SSL_LOG_DEBUG, "Proxy client certificate callback: (%s) entered");
+    ssl_log(s, SSL_LOG_DEBUG, 
+            "Proxy client certificate callback: (%s) entered", servername);
 
     if ((pcerts == NULL) || (sk_X509_INFO_num(pcerts) <= 0)) {
         ssl_log(s, SSL_LOG_TRACE,
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c
index 1baf203680d..e5b21a0b0c3 100644
--- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c
+++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c
@@ -1030,9 +1030,11 @@ void ssl_init_ModuleKill(void *data)
     /*
      * Try to kill the internals of the SSL library.
      */
+#ifdef SHARED_MODULE
     ERR_free_strings();
     ERR_remove_state(0);
     EVP_cleanup();
+#endif
 
     return;
 }