httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jchamp...@apache.org
Subject svn commit: r1791848 - in /httpd/httpd/branches/trunk-openssl-threadid: docs/log-message-tags/next-number modules/ssl/ssl_util.c
Date Wed, 19 Apr 2017 02:38:20 GMT
Author: jchampion
Date: Wed Apr 19 02:38:20 2017
New Revision: 1791848

URL: http://svn.apache.org/viewvc?rev=1791848&view=rev
Log:
ssl_util.c: add APLOGNOs

Start from 10027 to match the current trunk (r1791845), which will be
merged into shortly.

Modified:
    httpd/httpd/branches/trunk-openssl-threadid/docs/log-message-tags/next-number
    httpd/httpd/branches/trunk-openssl-threadid/modules/ssl/ssl_util.c

Modified: httpd/httpd/branches/trunk-openssl-threadid/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/trunk-openssl-threadid/docs/log-message-tags/next-number?rev=1791848&r1=1791847&r2=1791848&view=diff
==============================================================================
--- httpd/httpd/branches/trunk-openssl-threadid/docs/log-message-tags/next-number (original)
+++ httpd/httpd/branches/trunk-openssl-threadid/docs/log-message-tags/next-number Wed Apr
19 02:38:20 2017
@@ -1 +1 @@
-10024
+10031

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=1791848&r1=1791847&r2=1791848&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:38:20
2017
@@ -375,7 +375,7 @@ static void ssl_dyn_destroy_function(str
 /* We don't need to set up a threadid callback on this platform. */
 void ssl_util_thread_id_setup(apr_pool_t *p)
 {
-    ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, p, APLOGNO()
+    ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, p, APLOGNO(10027)
                   "using builtin threadid callback for OpenSSL");
 }
 
@@ -438,14 +438,14 @@ 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()
+    ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, p, APLOGNO(10028)
                   "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()
+    ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, p, APLOGNO(10029)
                   "using dangerous CRYPTO_THREADID_set_callback for OpenSSL");
 
     /* This is a last resort. We can only set this once, which means that we'd
@@ -456,7 +456,7 @@ void ssl_util_thread_id_setup(apr_pool_t
     if (CRYPTO_THREADID_get_callback() != ssl_util_thr_id) {
         /* XXX Unfortunately this doesn't seem to get logged unless you're
          * running in one-process mode, due to PR60999. */
-        ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, p, APLOGNO()
+        ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, p, APLOGNO(10030)
             "OpenSSL's THREADID callback was already set to another address, "
             "and the server is probably going to crash. See bug #60947 for "
             "more details. You may need to recompile or upgrade either OpenSSL "



Mime
View raw message