diff options
| author | Ruediger Pluem <rpluem@apache.org> | 2006-04-23 12:52:48 +0200 |
|---|---|---|
| committer | Ruediger Pluem <rpluem@apache.org> | 2006-04-23 12:52:48 +0200 |
| commit | 3f821517aa3a791cf7fcf34f26c46ec96c25f969 (patch) | |
| tree | 3a6b0b532c7a0b80ceff9f272ff7c299d544b277 /modules/cache | |
| parent | * Sync with 2.2.x CHANGES file (diff) | |
| download | apache2-3f821517aa3a791cf7fcf34f26c46ec96c25f969.tar.xz apache2-3f821517aa3a791cf7fcf34f26c46ec96c25f969.zip | |
* Consequently use disk_cache: in error log strings
PR: 39380
Submitted by: Niklas Edmundsson <nikke acc.umu.se>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396252 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache')
| -rw-r--r-- | modules/cache/mod_disk_cache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c index 2ad6fd0e88..56b9c68bd4 100644 --- a/modules/cache/mod_disk_cache.c +++ b/modules/cache/mod_disk_cache.c @@ -431,7 +431,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key) } else if (format != DISK_FORMAT_VERSION) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "cache_disk: File '%s' has a version mismatch. File had version: %d.", + "disk_cache: File '%s' has a version mismatch. File had version: %d.", dobj->hdrsfile, format); return DECLINED; } @@ -987,7 +987,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r, rv = apr_bucket_read(e, &str, &length, APR_BLOCK_READ); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "cache_disk: Error when reading bucket for URL %s", + "disk_cache: Error when reading bucket for URL %s", h->cache_obj->key); /* Remove the intermediate cache file and return non-APR_SUCCESS */ file_cache_errorcleanup(dobj, r); @@ -996,7 +996,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r, rv = apr_file_write_full(dobj->tfd, str, length, &written); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "cache_disk: Error when writing cache file for URL %s", + "disk_cache: Error when writing cache file for URL %s", h->cache_obj->key); /* Remove the intermediate cache file and return non-APR_SUCCESS */ file_cache_errorcleanup(dobj, r); @@ -1005,7 +1005,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r, dobj->file_size += written; if (dobj->file_size > conf->maxfs) { ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, - "cache_disk: URL %s failed the size check " + "disk_cache: URL %s failed the size check " "(%" APR_OFF_T_FMT ">%" APR_SIZE_T_FMT ")", h->cache_obj->key, dobj->file_size, conf->maxfs); /* Remove the intermediate cache file and return non-APR_SUCCESS */ @@ -1029,7 +1029,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r, } if (dobj->file_size < conf->minfs) { ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, - "cache_disk: URL %s failed the size check " + "disk_cache: URL %s failed the size check " "(%" APR_OFF_T_FMT "<%" APR_SIZE_T_FMT ")", h->cache_obj->key, dobj->file_size, conf->minfs); /* Remove the intermediate cache file and return non-APR_SUCCESS */ |