You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2021/06/24 14:17:02 UTC
svn commit: r1891023 - in /httpd/httpd/trunk: docs/log-message-tags/
modules/aaa/ modules/cache/ modules/dav/fs/ modules/dav/lock/
modules/mappers/ modules/proxy/
Author: minfrin
Date: Thu Jun 24 14:17:02 2021
New Revision: 1891023
URL: http://svn.apache.org/viewvc?rev=1891023&view=rev
Log:
Add log tags.
Modified:
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c
httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
httpd/httpd/trunk/modules/cache/mod_cache_socache.c
httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
httpd/httpd/trunk/modules/dav/fs/dbm.c
httpd/httpd/trunk/modules/dav/lock/locks.c
httpd/httpd/trunk/modules/mappers/mod_rewrite.c
httpd/httpd/trunk/modules/proxy/mod_proxy_express.c
Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1891023&r1=1891022&r2=1891023&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Thu Jun 24 14:17:02 2021
@@ -1 +1 @@
-10275
+10290
Modified: httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c?rev=1891023&r1=1891022&r2=1891023&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authn_dbm.c Thu Jun 24 14:17:02 2021
@@ -92,7 +92,7 @@ static apr_status_t fetch_dbm_value(requ
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(requ
#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;
Modified: httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c?rev=1891023&r1=1891022&r2=1891023&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_dbm.c Thu Jun 24 14:17:02 2021
@@ -113,7 +113,7 @@ static apr_status_t get_dbm_grp(request_
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;
Modified: httpd/httpd/trunk/modules/cache/mod_cache_socache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache_socache.c?rev=1891023&r1=1891022&r2=1891023&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache_socache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache_socache.c Thu Jun 24 14:17:02 2021
@@ -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"
Modified: httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dbm.c?rev=1891023&r1=1891022&r2=1891023&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dbm.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dbm.c Thu Jun 24 14:17:02 2021
@@ -149,7 +149,7 @@ static apr_status_t socache_dbm_init(ap_
#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
#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
#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(a
#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_socach
#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_socach
#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(
#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;
Modified: httpd/httpd/trunk/modules/dav/fs/dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/fs/dbm.c?rev=1891023&r1=1891022&r2=1891023&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/fs/dbm.c (original)
+++ httpd/httpd/trunk/modules/dav/fs/dbm.c Thu Jun 24 14:17:02 2021
@@ -143,7 +143,7 @@ dav_error * dav_dbm_open_direct(apr_pool
#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,
Modified: httpd/httpd/trunk/modules/dav/lock/locks.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/lock/locks.c?rev=1891023&r1=1891022&r2=1891023&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/lock/locks.c (original)
+++ httpd/httpd/trunk/modules/dav/lock/locks.c Thu Jun 24 14:17:02 2021
@@ -332,7 +332,7 @@ static dav_error * dav_generic_really_op
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,
Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?rev=1891023&r1=1891022&r2=1891023&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c Thu Jun 24 14:17:02 2021
@@ -1399,7 +1399,7 @@ static char *lookup_map_dbmfile(request_
#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;
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_express.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_express.c?rev=1891023&r1=1891022&r2=1891023&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_express.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_express.c Thu Jun 24 14:17:02 2021
@@ -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;
}