diff options
| author | Graham Leggett <minfrin@apache.org> | 2021-06-24 14:17:02 +0000 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2021-06-24 14:17:02 +0000 |
| commit | b72da39d62e59835a620946fa6ef32fb6996deb2 (patch) | |
| tree | 8e1dee6152430c306704b1cf64e55ac4c1b63b30 /modules/cache | |
| parent | 95592b5dda6c7e4876f5674976f5c7902b330cd2 (diff) | |
| download | httpd-b72da39d62e59835a620946fa6ef32fb6996deb2.tar.gz | |
Add log tags.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1891023 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache')
| -rw-r--r-- | modules/cache/mod_cache_socache.c | 6 | ||||
| -rw-r--r-- | modules/cache/mod_socache_dbm.c | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/modules/cache/mod_cache_socache.c b/modules/cache/mod_cache_socache.c index f369004a41..5f9e1d6c66 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 88453ae09b..a81b6c6759 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; |