From 26d5fb7164f612fed38a82939ad1a34249e61795 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sun, 4 Dec 2011 22:09:24 +0000 Subject: [PATCH] Add some more log message tags Remove some log message tags from ap_log_* calls that log lots of different error messages, in particular the config parsing errors. Not sure how we should handle those. ssl_util.c: Downgrade some dynamic locking messages from level DEBUG to TRACE1-3 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210252 13f79535-47bb-0310-9956-ffa450edef68 --- docs/log-message-tags/next-number | 2 +- modules/filters/mod_charset_lite.c | 15 +++++++-------- modules/filters/mod_sed.c | 2 +- modules/loggers/mod_log_debug.c | 4 ++-- modules/proxy/mod_proxy_balancer.c | 4 ++-- modules/ssl/ssl_engine_init.c | 12 ++++++------ modules/ssl/ssl_engine_kernel.c | 22 +++++++++++----------- modules/ssl/ssl_engine_pphrase.c | 14 +++++++------- modules/ssl/ssl_util.c | 28 ++++++++++++++-------------- modules/ssl/ssl_util_stapling.c | 8 ++++---- server/config.c | 11 +++++------ server/util_expr_eval.c | 4 ++-- server/util_filter.c | 2 +- 13 files changed, 63 insertions(+), 65 deletions(-) diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index d1003cf584..150b7eab65 100644 --- a/docs/log-message-tags/next-number +++ b/docs/log-message-tags/next-number @@ -1 +1 @@ -2183 +2231 diff --git a/modules/filters/mod_charset_lite.c b/modules/filters/mod_charset_lite.c index 31cf21e33f..25f1ecb2ff 100644 --- a/modules/filters/mod_charset_lite.c +++ b/modules/filters/mod_charset_lite.c @@ -479,19 +479,19 @@ static void log_xlate_error(ap_filter_t *f, apr_status_t rv) switch(ctx->ees) { case EES_LIMIT: rv = 0; - msg = "xlate filter - a built-in restriction was encountered"; + msg = APLOGNO(02193) "xlate filter - a built-in restriction was encountered"; break; case EES_BAD_INPUT: rv = 0; - msg = "xlate filter - an input character was invalid"; + msg = APLOGNO(02194) "xlate filter - an input character was invalid"; break; case EES_BUCKET_READ: rv = 0; - msg = "xlate filter - bucket read routine failed"; + msg = APLOGNO(02195) "xlate filter - bucket read routine failed"; break; case EES_INCOMPLETE_CHAR: rv = 0; - strcpy(msgbuf, "xlate filter - incomplete char at end of input - "); + strcpy(msgbuf, APLOGNO(02196) "xlate filter - incomplete char at end of input - "); cur = 0; while ((apr_size_t)cur < ctx->saved) { apr_snprintf(msgbuf + strlen(msgbuf), sizeof(msgbuf) - strlen(msgbuf), @@ -501,13 +501,12 @@ static void log_xlate_error(ap_filter_t *f, apr_status_t rv) msg = msgbuf; break; case EES_DOWNSTREAM: - msg = "xlate filter - an error occurred in a lower filter"; + msg = APLOGNO(02197) "xlate filter - an error occurred in a lower filter"; break; default: - msg = "xlate filter - returning error"; + msg = APLOGNO(02198) "xlate filter - returning error"; } - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, APLOGNO(01450) - "%s", msg); + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "%s", msg); } /* chk_filter_chain() is called once per filter instance; it tries to diff --git a/modules/filters/mod_sed.c b/modules/filters/mod_sed.c index 8d93aadcb5..dd776c4878 100644 --- a/modules/filters/mod_sed.c +++ b/modules/filters/mod_sed.c @@ -64,7 +64,7 @@ module AP_MODULE_DECLARE_DATA sed_module; static apr_status_t log_sed_errf(void *data, const char *error) { request_rec *r = (request_rec *) data; - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01381) "%s", error); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", error); return APR_SUCCESS; } diff --git a/modules/loggers/mod_log_debug.c b/modules/loggers/mod_log_debug.c index c4dc2a035d..0361cba716 100644 --- a/modules/loggers/mod_log_debug.c +++ b/modules/loggers/mod_log_debug.c @@ -79,11 +79,11 @@ static void do_debug_log(request_rec *r, const char *hookname) ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00641) "Can't evaluate message expression: %s", err); if (APLOGrdebug(r)) - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00642) "%s (%s hook, %s:%d)", + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "%s (%s hook, %s:%d)", msg, hookname, entry->msg_expr->filename, entry->msg_expr->line_number); else - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00643) "%s", msg); + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "%s", msg); } } diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index 1fb87f0c8e..eb15f08791 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -707,8 +707,8 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog, ap_proxy_retry_worker_fn = APR_RETRIEVE_OPTIONAL_FN(ap_proxy_retry_worker); if (!ap_proxy_retry_worker_fn) { - ap_log_error( - APLOG_MARK, APLOG_EMERG, 0, s, "mod_proxy must be loaded for mod_proxy_balancer"); + ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02230) + "mod_proxy must be loaded for mod_proxy_balancer"); return !OK; } } diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index ba801d7c95..37f416fcaf 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -1204,7 +1204,7 @@ static void ssl_init_proxy_certs(server_rec *s, if ((ncerts = sk_X509_INFO_num(sk)) <= 0) { sk_X509_INFO_free(sk); - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02206) "no client certs found for SSL proxy"); return; } @@ -1224,7 +1224,7 @@ static void ssl_init_proxy_certs(server_rec *s, } } - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02207) "loaded %d client certs for SSL proxy", ncerts); pkp->certs = sk; @@ -1239,7 +1239,7 @@ static void ssl_init_proxy_certs(server_rec *s, sctx = X509_STORE_CTX_new(); if (!sctx) { - ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, + ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02208) "SSL proxy client cert initialization failed"); ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, s); ssl_die(); @@ -1464,7 +1464,7 @@ static void ssl_init_PushCAList(STACK_OF(X509_NAME) *ca_list, for (n = 0; n < sk_X509_NAME_num(sk); n++) { X509_NAME *name = sk_X509_NAME_value(sk, n); - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02209) "CA certificate: %s", SSL_X509_NAME_to_string(ptemp, name, 0)); @@ -1510,7 +1510,7 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s, * then the file failed to load, and users should hear about that. */ if (sk_X509_NAME_num(ca_list) == 0) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02210) "Failed to load SSLCACertificateFile: %s", ca_file); ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s); } @@ -1526,7 +1526,7 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s, apr_status_t rv; if ((rv = apr_dir_open(&dir, ca_path, ptemp)) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, + ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(02211) "Failed to open Certificate Path `%s'", ca_path); ssl_die(); diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index 297b446be7..e227201877 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -330,7 +330,7 @@ int ssl_hook_Access(request_rec *r) return HTTP_UPGRADE_REQUIRED; } - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02219) "access to %s failed, reason: %s", r->filename, "SSL connection required"); @@ -482,7 +482,7 @@ int ssl_hook_Access(request_rec *r) } #endif /* tracing */ - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02220) "Reconfigured cipher suite will force renegotiation"); } } @@ -673,7 +673,7 @@ int ssl_hook_Access(request_rec *r) * here because it resets too much of the connection. So we set the * state explicitly and continue the handshake manually. */ - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02221) "Requesting connection re-negotiation"); if (renegotiate_quick) { @@ -699,7 +699,7 @@ int ssl_hook_Access(request_rec *r) } if (!cert_stack || (sk_X509_num(cert_stack) == 0)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02222) "Cannot find peer certificate chain"); return HTTP_FORBIDDEN; @@ -708,7 +708,7 @@ int ssl_hook_Access(request_rec *r) if (!(cert_store || (cert_store = SSL_CTX_get_cert_store(ctx)))) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02223) "Cannot find certificate storage"); return HTTP_FORBIDDEN; @@ -730,7 +730,7 @@ int ssl_hook_Access(request_rec *r) (char *)ssl); if (!X509_verify_cert(&cert_store_ctx)) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02224) "Re-negotiation verification step failed"); ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, r->server); } @@ -787,7 +787,7 @@ int ssl_hook_Access(request_rec *r) SSL_do_handshake(ssl); if (SSL_get_state(ssl) != SSL_ST_OK) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02225) "Re-negotiation request failed"); ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, r->server); @@ -795,7 +795,7 @@ int ssl_hook_Access(request_rec *r) return HTTP_FORBIDDEN; } - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02226) "Awaiting re-negotiation handshake"); /* XXX: Should replace setting ssl->state with SSL_renegotiate(ssl); @@ -886,7 +886,7 @@ int ssl_hook_Access(request_rec *r) if (val && val[0]) r->user = val; else - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02227) "Failed to set r->user to '%s'", dc->szUserName); } @@ -919,10 +919,10 @@ int ssl_hook_Access(request_rec *r) "(requirement expression not fulfilled)", r->filename, r->client_ip); - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02228) "Failed expression: %s", req->cpExpr); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02229) "access to %s failed, reason: %s", r->filename, "SSL requirement expression not fulfilled"); diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c index b71e686270..b9173fac69 100644 --- a/modules/ssl/ssl_engine_pphrase.c +++ b/modules/ssl/ssl_engine_pphrase.c @@ -176,13 +176,13 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) sc = mySrvConfig(pServ); cpVHostID = ssl_util_vhostid(p, pServ); if (!sc->enabled) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, pServ, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, pServ, APLOGNO(02199) "SSL not enabled on vhost %s, skipping SSL setup", cpVHostID); continue; } - ap_log_error(APLOG_MARK, APLOG_INFO, 0, pServ, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, pServ, APLOGNO(02200) "Loading certificate & private key of SSL-aware server '%s'", cpVHostID); @@ -222,7 +222,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) sizeof(szPath)); if ((rv = exists_and_readable(szPath, p, NULL)) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, + ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(02201) "Init: Can't open server certificate file %s", szPath); ssl_die(); @@ -234,7 +234,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, s); ssl_die(); } - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02202) "Init: Read server certificate from '%s'", szPath); } @@ -445,7 +445,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) } else { ap_log_error(APLOG_MARK, APLOG_ERR, 0, - pServ, "Init: Private key not found"); + pServ, APLOGNO(02203) "Init: Private key not found"); ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, pServ); } if (writetty) { @@ -454,7 +454,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) } } else { - ap_log_error(APLOG_MARK, APLOG_EMERG, 0, pServ, + ap_log_error(APLOG_MARK, APLOG_EMERG, 0, pServ, APLOGNO(02204) "Init: Pass phrase incorrect for key of %s", cpVHostID); ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, pServ); @@ -569,7 +569,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) */ if (aPassPhrase->nelts) { pphrase_array_clear(aPassPhrase); - ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, APLOGNO(02205) "Init: Wiped out the queried pass phrases from memory"); } diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c index 3a88493750..9750253750 100644 --- a/modules/ssl/ssl_util.c +++ b/modules/ssl/ssl_util.c @@ -286,7 +286,7 @@ STACK_OF(X509) *ssl_read_pkcs7(server_rec *s, const char *pkcs7) f = fopen(pkcs7, "r"); if (!f) { - ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, "Can't open %s", pkcs7); + ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02212) "Can't open %s", pkcs7); ssl_die(); } @@ -312,13 +312,13 @@ STACK_OF(X509) *ssl_read_pkcs7(server_rec *s, const char *pkcs7) break; default: - ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, + ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02213) "Don't understand PKCS7 file %s", pkcs7); ssl_die(); } if (!certs) { - ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, + ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02214) "No certificates in %s", pkcs7); ssl_die(); } @@ -379,18 +379,18 @@ static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file, rv = apr_pool_create(&p, dynlockpool); if (rv != APR_SUCCESS) { ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, dynlockpool, - "Failed to create subpool for dynamic lock"); + APLOGNO(02183) "Failed to create subpool for dynamic lock"); return NULL; } - ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, p, + ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_TRACE1, 0, p, "Creating dynamic lock"); value = (struct CRYPTO_dynlock_value *)apr_palloc(p, sizeof(struct CRYPTO_dynlock_value)); if (!value) { ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, 0, p, - "Failed to allocate dynamic lock structure"); + APLOGNO(02185) "Failed to allocate dynamic lock structure"); return NULL; } @@ -402,7 +402,7 @@ static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file, rv = apr_thread_mutex_create(&(value->mutex), APR_THREAD_MUTEX_DEFAULT, p); if (rv != APR_SUCCESS) { - ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, p, + ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, p, APLOGNO(02186) "Failed to create thread mutex for dynamic lock"); apr_pool_destroy(p); return NULL; @@ -420,17 +420,17 @@ static void ssl_dyn_lock_function(int mode, struct CRYPTO_dynlock_value *l, apr_status_t rv; if (mode & CRYPTO_LOCK) { - ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, l->pool, + ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_TRACE3, 0, l->pool, "Acquiring mutex %s:%d", l->file, l->line); rv = apr_thread_mutex_lock(l->mutex); - ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, rv, l->pool, + ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_TRACE3, rv, l->pool, "Mutex %s:%d acquired!", l->file, l->line); } else { - ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, l->pool, + ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_TRACE3, 0, l->pool, "Releasing mutex %s:%d", l->file, l->line); rv = apr_thread_mutex_unlock(l->mutex); - ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, rv, l->pool, + ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_TRACE3, rv, l->pool, "Mutex %s:%d released!", l->file, l->line); } } @@ -443,13 +443,13 @@ static void ssl_dyn_destroy_function(struct CRYPTO_dynlock_value *l, { apr_status_t rv; - ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, l->pool, + ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_TRACE1, 0, l->pool, "Destroying dynamic lock %s:%d", l->file, l->line); rv = apr_thread_mutex_destroy(l->mutex); if (rv != APR_SUCCESS) { ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, l->pool, - "Failed to destroy mutex for dynamic lock %s:%d", - l->file, l->line); + APLOGNO(02192) "Failed to destroy mutex for dynamic " + "lock %s:%d", l->file, l->line); } /* Trust that whomever owned the CRYPTO_dynlock_value we were diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c index c294bf36f8..941fb2851d 100644 --- a/modules/ssl/ssl_util_stapling.c +++ b/modules/ssl/ssl_util_stapling.c @@ -109,13 +109,13 @@ int ssl_stapling_init_cert(server_rec *s, modssl_ctx_t *mctx, X509 *x) return 0; cinf = X509_get_ex_data(x, stapling_ex_idx); if (cinf) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02215) "ssl_stapling_init_cert: certificate already initialized!"); return 0; } cinf = OPENSSL_malloc(sizeof(certinfo)); if (!cinf) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02216) "ssl_stapling_init_cert: error allocating memory!"); return 0; } @@ -126,7 +126,7 @@ int ssl_stapling_init_cert(server_rec *s, modssl_ctx_t *mctx, X509 *x) issuer = stapling_get_issuer(mctx, x); if (issuer == NULL) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02217) "ssl_stapling_init_cert: Can't retrieve issuer certificate!"); return 0; } @@ -141,7 +141,7 @@ int ssl_stapling_init_cert(server_rec *s, modssl_ctx_t *mctx, X509 *x) if (aia) cinf->uri = sk_OPENSSL_STRING_pop(aia); if (!cinf->uri && !mctx->stapling_force_url) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02218) "ssl_stapling_init_cert: no responder URL"); } if (aia) diff --git a/server/config.c b/server/config.c index d141b75c46..543129164c 100644 --- a/server/config.c +++ b/server/config.c @@ -2008,8 +2008,7 @@ AP_DECLARE(int) ap_process_config_tree(server_rec *s, "Syntax error on line %d of %s:", parms.err_directive->line_num, parms.err_directive->filename); - ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, p, APLOGNO(00527) - "%s", errmsg); + ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, p, "%s", errmsg); return HTTP_INTERNAL_SERVER_ERROR; } @@ -2070,7 +2069,7 @@ AP_CORE_DECLARE(int) ap_parse_htaccess(ap_conf_vector_t **result, ap_cfg_closefile(f); if (errmsg) { - ap_log_rerror(APLOG_MARK, APLOG_ALERT, 0, r, APLOGNO(00528) + ap_log_rerror(APLOG_MARK, APLOG_ALERT, 0, r, "%s: %s", filename, errmsg); return HTTP_INTERNAL_SERVER_ERROR; } @@ -2337,7 +2336,7 @@ AP_DECLARE(server_rec*) ap_read_config(process_rec *process, apr_pool_t *ptemp, error = process_command_config(s, ap_server_pre_read_config, conftree, p, ptemp); if (error) { - ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL, APLOGNO(00531) "%s: %s", + ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL, "%s: %s", ap_server_argv0, error); return NULL; } @@ -2356,7 +2355,7 @@ AP_DECLARE(server_rec*) ap_read_config(process_rec *process, apr_pool_t *ptemp, error = ap_process_resource_config(s, confname, conftree, p, ptemp); if (error) { - ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL, APLOGNO(00533) + ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL, "%s: %s", ap_server_argv0, error); return NULL; } @@ -2372,7 +2371,7 @@ AP_DECLARE(server_rec*) ap_read_config(process_rec *process, apr_pool_t *ptemp, p, ptemp); if (error) { - ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL, APLOGNO(00535) "%s: %s", + ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL, "%s: %s", ap_server_argv0, error); return NULL; } diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c index ffb7ba5422..53882e04f5 100644 --- a/server/util_expr_eval.c +++ b/server/util_expr_eval.c @@ -806,7 +806,7 @@ AP_DECLARE(int) ap_expr_exec_ctx(ap_expr_eval_ctx_t *ctx) if (ctx->info->flags & AP_EXPR_FLAG_STRING_RESULT) { *ctx->result_string = ap_expr_eval_word(ctx, ctx->info->root_node); if (*ctx->err != NULL) { - ap_log_rerror(LOG_MARK(ctx->info), APLOG_ERR, 0, ctx->r, APLOGNO(00536) + ap_log_rerror(LOG_MARK(ctx->info), APLOG_ERR, 0, ctx->r, "Evaluation of expression from %s:%d failed: %s", ctx->info->filename, ctx->info->line_number, *ctx->err); return -1; @@ -821,7 +821,7 @@ AP_DECLARE(int) ap_expr_exec_ctx(ap_expr_eval_ctx_t *ctx) else { rc = ap_expr_eval(ctx, ctx->info->root_node); if (*ctx->err != NULL) { - ap_log_rerror(LOG_MARK(ctx->info), APLOG_ERR, 0, ctx->r, APLOGNO(00537) + ap_log_rerror(LOG_MARK(ctx->info), APLOG_ERR, 0, ctx->r, "Evaluation of expression from %s:%d failed: %s", ctx->info->filename, ctx->info->line_number, *ctx->err); return -1; diff --git a/server/util_filter.c b/server/util_filter.c index 204d47dc9d..7121eced9e 100644 --- a/server/util_filter.c +++ b/server/util_filter.c @@ -561,7 +561,7 @@ AP_DECLARE(apr_status_t) ap_pass_brigade_fchk(request_rec *r, va_start(ap, fmt); res = apr_pvsprintf(r->pool, fmt, ap); va_end(ap); - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(00084) "%s", res); + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, "%s", res); } return HTTP_INTERNAL_SERVER_ERROR; } -- 2.40.0