diff options
| author | Jacob Champion <jchampion@apache.org> | 2017-04-19 02:38:20 +0000 |
|---|---|---|
| committer | Jacob Champion <jchampion@apache.org> | 2017-04-19 02:38:20 +0000 |
| commit | b05388b5e5d755ca8c0f74a0fccfcc22dbe2a4fa (patch) | |
| tree | 158f5fcaa8a47c46919d5e364318f829d65c8a26 | |
| parent | bac77f2026d9776bd462928443ea7dcedceb7458 (diff) | |
| download | httpd-trunk-openssl-threadid.tar.gz | |
ssl_util.c: add APLOGNOstrunk-openssl-threadid
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
| -rw-r--r-- | docs/log-message-tags/next-number | 2 | ||||
| -rw-r--r-- | modules/ssl/ssl_util.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index ac4e051f0a..16fdd7822c 100644 --- 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 0e0a2694e4..00ad08727e 100644 --- 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 " |