View | Details | Raw Unified | Return to bug 39380
Collapse All | Expand All

(-)../dist/modules/cache/mod_disk_cache.c (-5 / +5 lines)
Lines 431-437 Link Here
431
    }
431
    }
432
    else if (format != DISK_FORMAT_VERSION) {
432
    else if (format != DISK_FORMAT_VERSION) {
433
        ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
433
        ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
434
                     "cache_disk: File '%s' has a version mismatch. File had version: %d.",
434
                     "disk_cache: File '%s' has a version mismatch. File had version: %d.",
435
                     dobj->hdrsfile, format);
435
                     dobj->hdrsfile, format);
436
        return DECLINED;
436
        return DECLINED;
437
    }
437
    }
Lines 987-993 Link Here
987
        rv = apr_bucket_read(e, &str, &length, APR_BLOCK_READ);
987
        rv = apr_bucket_read(e, &str, &length, APR_BLOCK_READ);
988
        if (rv != APR_SUCCESS) {
988
        if (rv != APR_SUCCESS) {
989
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
989
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
990
                         "cache_disk: Error when reading bucket for URL %s",
990
                         "disk_cache: Error when reading bucket for URL %s",
991
                         h->cache_obj->key);
991
                         h->cache_obj->key);
992
            /* Remove the intermediate cache file and return non-APR_SUCCESS */
992
            /* Remove the intermediate cache file and return non-APR_SUCCESS */
993
            file_cache_errorcleanup(dobj, r);
993
            file_cache_errorcleanup(dobj, r);
Lines 996-1002 Link Here
996
        rv = apr_file_write_full(dobj->tfd, str, length, &written);
996
        rv = apr_file_write_full(dobj->tfd, str, length, &written);
997
        if (rv != APR_SUCCESS) {
997
        if (rv != APR_SUCCESS) {
998
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
998
            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
999
                         "cache_disk: Error when writing cache file for URL %s",
999
                         "disk_cache: Error when writing cache file for URL %s",
1000
                         h->cache_obj->key);
1000
                         h->cache_obj->key);
1001
            /* Remove the intermediate cache file and return non-APR_SUCCESS */
1001
            /* Remove the intermediate cache file and return non-APR_SUCCESS */
1002
            file_cache_errorcleanup(dobj, r);
1002
            file_cache_errorcleanup(dobj, r);
Lines 1005-1011 Link Here
1005
        dobj->file_size += written;
1005
        dobj->file_size += written;
1006
        if (dobj->file_size > conf->maxfs) {
1006
        if (dobj->file_size > conf->maxfs) {
1007
            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
1007
            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
1008
                         "cache_disk: URL %s failed the size check "
1008
                         "disk_cache: URL %s failed the size check "
1009
                         "(%" APR_OFF_T_FMT ">%" APR_SIZE_T_FMT ")",
1009
                         "(%" APR_OFF_T_FMT ">%" APR_SIZE_T_FMT ")",
1010
                         h->cache_obj->key, dobj->file_size, conf->maxfs);
1010
                         h->cache_obj->key, dobj->file_size, conf->maxfs);
1011
            /* Remove the intermediate cache file and return non-APR_SUCCESS */
1011
            /* Remove the intermediate cache file and return non-APR_SUCCESS */
Lines 1029-1035 Link Here
1029
        }
1029
        }
1030
        if (dobj->file_size < conf->minfs) {
1030
        if (dobj->file_size < conf->minfs) {
1031
            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
1031
            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
1032
                         "cache_disk: URL %s failed the size check "
1032
                         "disk_cache: URL %s failed the size check "
1033
                         "(%" APR_OFF_T_FMT "<%" APR_SIZE_T_FMT ")",
1033
                         "(%" APR_OFF_T_FMT "<%" APR_SIZE_T_FMT ")",
1034
                         h->cache_obj->key, dobj->file_size, conf->minfs);
1034
                         h->cache_obj->key, dobj->file_size, conf->minfs);
1035
            /* Remove the intermediate cache file and return non-APR_SUCCESS */
1035
            /* Remove the intermediate cache file and return non-APR_SUCCESS */

Return to bug 39380