httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkal...@apache.org
Subject svn commit: r1638772 - /httpd/httpd/trunk/modules/ssl/mod_ssl.c
Date Wed, 12 Nov 2014 12:27:09 GMT
Author: jkaluza
Date: Wed Nov 12 12:27:09 2014
New Revision: 1638772

URL: http://svn.apache.org/r1638772
Log:
* mod_ssl: call ERR_free_strings() with OpenSSL >= 0.9.8e. Fixes memory leak
in mod_ssl on graceful restart. PR 53435.

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

Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl.c?rev=1638772&r1=1638771&r2=1638772&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/mod_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/mod_ssl.c Wed Nov 12 12:27:09 2014
@@ -313,9 +313,12 @@ static apr_status_t ssl_cleanup_pre_conf
     ERR_remove_state(0);
 #endif
 
-    /* Don't call ERR_free_strings here; ERR_load_*_strings only
-     * actually load the error strings once per process due to static
+    /* Don't call ERR_free_strings in earlier versions, ERR_load_*_strings only
+     * actually loaded the error strings once per process due to static
      * variable abuse in OpenSSL. */
+#if (OPENSSL_VERSION_NUMBER >= 0x00090805f)
+    ERR_free_strings();
+#endif
 
     /* Also don't call CRYPTO_cleanup_all_ex_data here; any registered
      * ex_data indices may have been cached in static variables in



Mime
View raw message