httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jchamp...@apache.org
Subject svn commit: r1791847 - /httpd/httpd/branches/trunk-openssl-threadid/modules/ssl/ssl_util.c
Date Wed, 19 Apr 2017 02:23:48 GMT
Author: jchampion
Date: Wed Apr 19 02:23:48 2017
New Revision: 1791847

URL: http://svn.apache.org/viewvc?rev=1791847&view=rev
Log:
ssl_util.c: log which threadid callback is in use

This should help during testing and debugging. Use APLOG_NOTICE for now,
until we fix PR60999, so that people can actually see the log message.

Modified:
    httpd/httpd/branches/trunk-openssl-threadid/modules/ssl/ssl_util.c

Modified: httpd/httpd/branches/trunk-openssl-threadid/modules/ssl/ssl_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/trunk-openssl-threadid/modules/ssl/ssl_util.c?rev=1791847&r1=1791846&r2=1791847&view=diff
==============================================================================
--- httpd/httpd/branches/trunk-openssl-threadid/modules/ssl/ssl_util.c (original)
+++ httpd/httpd/branches/trunk-openssl-threadid/modules/ssl/ssl_util.c Wed Apr 19 02:23:48
2017
@@ -373,7 +373,11 @@ static void ssl_dyn_destroy_function(str
 #if DEFAULT_THREADID_IS_SAFE
 
 /* We don't need to set up a threadid callback on this platform. */
-void ssl_util_thread_id_setup(apr_pool_t *p) { }
+void ssl_util_thread_id_setup(apr_pool_t *p)
+{
+    ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, p, APLOGNO()
+                  "using builtin threadid callback for OpenSSL");
+}
 
 #else
 
@@ -434,10 +438,16 @@ static apr_status_t ssl_util_thr_id_clea
 void ssl_util_thread_id_setup(apr_pool_t *p)
 {
 #if HAVE_CRYPTO_SET_ID_CALLBACK
+    ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, p, APLOGNO()
+                  "using deprecated CRYPTO_set_id_callback for OpenSSL");
+
     /* This API is deprecated, but we prefer it to its replacement since it
      * allows us to unset the callback when this module is being unloaded. */
     CRYPTO_set_id_callback(ssl_util_thr_id);
 #else
+    ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, p, APLOGNO()
+                  "using dangerous CRYPTO_THREADID_set_callback for OpenSSL");
+
     /* This is a last resort. We can only set this once, which means that we'd
      * better not get loaded into a different address during a restart. See
      * PR60947. */



Mime
View raw message