From: Graham Leggett Date: Thu, 24 Jun 2021 14:17:02 +0000 (+0000) Subject: Add log tags. X-Git-Tag: 2.5.0-alpha2-ci-test-only~915 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b72da39d62e59835a620946fa6ef32fb6996deb2;p=thirdparty%2Fapache%2Fhttpd.git Add log tags. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1891023 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index 182bc7c9398..4c314813df1 100644 --- a/docs/log-message-tags/next-number +++ b/docs/log-message-tags/next-number @@ -1 +1 @@ -10275 +10290 diff --git a/modules/aaa/mod_authn_dbm.c b/modules/aaa/mod_authn_dbm.c index a612f371a0e..e4f965ab8ff 100644 --- a/modules/aaa/mod_authn_dbm.c +++ b/modules/aaa/mod_authn_dbm.c @@ -92,7 +92,7 @@ static apr_status_t fetch_dbm_value(request_rec *r, const char *dbmtype, rv = apr_dbm_get_driver(&driver, dbmtype, &err, r->pool); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10284) "could not load '%s' dbm library: %s", err->reason, err->msg); return rv; @@ -106,7 +106,7 @@ static apr_status_t fetch_dbm_value(request_rec *r, const char *dbmtype, #endif if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10285) "could not open dbm (type %s) file: %s", dbmtype, dbmfile); return rv; diff --git a/modules/aaa/mod_authz_dbm.c b/modules/aaa/mod_authz_dbm.c index 90d35b07f1a..f11de6897e6 100644 --- a/modules/aaa/mod_authz_dbm.c +++ b/modules/aaa/mod_authz_dbm.c @@ -113,7 +113,7 @@ static apr_status_t get_dbm_grp(request_rec *r, char *key1, char *key2, retval = apr_dbm_get_driver(&driver, dbtype, &err, r->pool); if (retval != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, retval, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, retval, r, APLOGNO(10286) "could not load '%s' dbm library: %s", err->reason, err->msg); return retval; diff --git a/modules/cache/mod_cache_socache.c b/modules/cache/mod_cache_socache.c index f369004a417..5f9e1d6c661 100644 --- a/modules/cache/mod_cache_socache.c +++ b/modules/cache/mod_cache_socache.c @@ -18,6 +18,12 @@ #include "apr_file_io.h" #include "apr_strings.h" #include "apr_buckets.h" + +#include "apr_version.h" +#if !APR_VERSION_AT_LEAST(2,0,0) +#include "apu_version.h" +#endif + #include "httpd.h" #include "http_config.h" #include "http_log.h" diff --git a/modules/cache/mod_socache_dbm.c b/modules/cache/mod_socache_dbm.c index 88453ae09b4..a81b6c67596 100644 --- a/modules/cache/mod_socache_dbm.c +++ b/modules/cache/mod_socache_dbm.c @@ -149,7 +149,7 @@ static apr_status_t socache_dbm_init(ap_socache_instance_t *ctx, #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7) if ((rv = apr_dbm_get_driver(&driver, NULL, &err, ctx->pool) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10277) "Cannot load socache DBM library '%s': %s", err->reason, err->msg); return rv; @@ -256,7 +256,7 @@ static apr_status_t socache_dbm_store(ap_socache_instance_t *ctx, #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7) if ((rv = apr_dbm_get_driver(&driver, NULL, &err, ctx->pool) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10278) "Cannot load socache DBM library '%s' (store): %s", err->reason, err->msg); free(dbmval.dptr); @@ -333,7 +333,7 @@ static apr_status_t socache_dbm_retrieve(ap_socache_instance_t *ctx, server_rec #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7) if ((rv = apr_dbm_get_driver(&driver, NULL, &err, ctx->pool) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10279) "Cannot load socache DBM library '%s' (fetch): %s", err->reason, err->msg); return rc; @@ -411,7 +411,7 @@ static apr_status_t socache_dbm_remove(ap_socache_instance_t *ctx, #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7) if ((rv = apr_dbm_get_driver(&driver, NULL, &err, ctx->pool) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10280) "Cannot load socache DBM library '%s' (delete): %s", err->reason, err->msg); return rv; @@ -474,7 +474,7 @@ static void socache_dbm_expire(ap_socache_instance_t *ctx, server_rec *s) #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7) if ((rv = apr_dbm_get_driver(&driver, NULL, &err, ctx->pool) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10281) "Cannot load socache DBM library '%s' (expire): %s", err->reason, err->msg); return rv; @@ -605,7 +605,7 @@ static void socache_dbm_status(ap_socache_instance_t *ctx, request_rec *r, #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7) if ((rv = apr_dbm_get_driver(&driver, NULL, &err, ctx->pool) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10282) "Cannot load socache DBM library '%s' (status retrieval): %s", err->reason, err->msg); return; @@ -682,7 +682,7 @@ static apr_status_t socache_dbm_iterate(ap_socache_instance_t *ctx, #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7) if ((rv = apr_dbm_get_driver(&driver, NULL, &err, ctx->pool) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10283) "Cannot load socache DBM library '%s' (iterating): %s", err->reason, err->msg); return rv; diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c index d37fcd38b65..347d75d8c59 100644 --- a/modules/dav/fs/dbm.c +++ b/modules/dav/fs/dbm.c @@ -143,7 +143,7 @@ dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname, int ro, #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7) if ((status = apr_dbm_get_driver(&driver, NULL, &err, p)) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO(10289) "mod_dav_fs: The DBM library '%s' could not be loaded: %s", err->reason, err->msg); return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 1, status, diff --git a/modules/dav/lock/locks.c b/modules/dav/lock/locks.c index 2202be7e600..e85e288b326 100644 --- a/modules/dav/lock/locks.c +++ b/modules/dav/lock/locks.c @@ -332,7 +332,7 @@ static dav_error * dav_generic_really_open_lockdb(dav_lockdb *lockdb) status = apr_dbm_get_driver(&driver, NULL, &er, lockdb->info->pool); if (status) { - ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO(10288) "mod_dav_lock: The DBM library '%s' could not be loaded: %s", er->reason, er->msg); return dav_new_error(lockdb->info->pool, HTTP_INTERNAL_SERVER_ERROR, 1, diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index b2225d1b5bd..06d8a154370 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -1399,7 +1399,7 @@ static char *lookup_map_dbmfile(request_rec *r, const char *file, #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7) if ((rv = apr_dbm_get_driver(&driver, dbmtype, &err, r->pool)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10287) "mod_rewrite: can't load DBM library '%s': %s", err->reason, err->msg); return NULL; diff --git a/modules/proxy/mod_proxy_express.c b/modules/proxy/mod_proxy_express.c index 3f1d5ad2efd..5d458c4a1c4 100644 --- a/modules/proxy/mod_proxy_express.c +++ b/modules/proxy/mod_proxy_express.c @@ -146,7 +146,7 @@ static int xlate_name(request_rec *r) rv = apr_dbm_get_driver(&driver, sconf->dbmtype, &err, r->pool); if (rv != APR_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, - APLOGNO() "The dbm library '%s' could not be loaded: %s (%s: %d)", + APLOGNO(10275) "The dbm library '%s' could not be loaded: %s (%s: %d)", sconf->dbmtype, err->msg, err->reason, err->rc); return DECLINED; } @@ -155,7 +155,7 @@ static int xlate_name(request_rec *r) APR_OS_DEFAULT, r->pool); if (rv != APR_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, - APLOGNO() "The '%s' file '%s' could not be loaded", + APLOGNO(10276) "The '%s' file '%s' could not be loaded", sconf->dbmtype, sconf->dbmfile); return DECLINED; }