ssl_util.c: add APLOGNOs

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-openssl-threadid@1791848 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index ac4e051f0ae2d5d437f47e5c3bc71c5673f81684..16fdd7822c97b53d1507edd2707a6d4d3a45480a 100644 (file)
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-10024
+10031

diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index 0e0a2694e4b4fe5c0a206eafdadd0695e8195a2b..00ad08727ed67e552481af54ae5a71aa3a634dbc 100644 (file)
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -375,7 +375,7 @@ static void ssl_dyn_destroy_function(struct CRYPTO_dynlock_value *l,
 /* 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_cleanup(void *old)
 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 *p)
     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 "