Skip to content

Commit 2788b69

Browse files
author
Stefan Fritsch
committed
Downgrade some more error messages about broken client behavior to level
info. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204630 13f79535-47bb-0310-9956-ffa450edef68
1 parent e70bea7 commit 2788b69

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎modules/http/http_filters.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
267267
/* Something that isn't in HTTP, unless some future
268268
* edition defines new transfer ecodings, is unsupported.
269269
*/
270-
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
270+
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r,
271271
"Unknown Transfer-Encoding: %s", tenc);
272272
return bail_out_on_error(ctx, f, HTTP_NOT_IMPLEMENTED);
273273
}
@@ -289,7 +289,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
289289
|| endstr == lenp || *endstr || ctx->remaining < 0) {
290290

291291
ctx->remaining = 0;
292-
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
292+
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r,
293293
"Invalid Content-Length");
294294

295295
return bail_out_on_error(ctx, f, HTTP_REQUEST_ENTITY_TOO_LARGE);
@@ -299,7 +299,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
299299
* time, stop it here if it is invalid.
300300
*/
301301
if (ctx->limit && ctx->limit < ctx->remaining) {
302-
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
302+
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r,
303303
"Requested content-length of %" APR_OFF_T_FMT
304304
" is larger than the configured limit"
305305
" of %" APR_OFF_T_FMT, ctx->remaining, ctx->limit);
@@ -392,7 +392,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
392392

393393
/* Detect chunksize error (such as overflow) */
394394
if (rv != APR_SUCCESS || ctx->remaining < 0) {
395-
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "Error reading first chunk %s ",
395+
ap_log_rerror(APLOG_MARK, APLOG_INFO, rv, f->r, "Error reading first chunk %s ",
396396
(ctx->remaining < 0) ? "(overflow)" : "");
397397
ctx->remaining = 0; /* Reset it in case we have to
398398
* come back here later */
@@ -498,7 +498,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
498498

499499
/* Detect chunksize error (such as overflow) */
500500
if (rv != APR_SUCCESS || ctx->remaining < 0) {
501-
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "Error reading chunk %s ",
501+
ap_log_rerror(APLOG_MARK, APLOG_INFO, rv, f->r, "Error reading chunk %s ",
502502
(ctx->remaining < 0) ? "(overflow)" : "");
503503
ctx->remaining = 0; /* Reset it in case we have to
504504
* come back here later */
@@ -567,7 +567,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
567567
* really count. This seems to be up for interpretation. */
568568
ctx->limit_used += totalread;
569569
if (ctx->limit < ctx->limit_used) {
570-
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
570+
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r,
571571
"Read content-length of %" APR_OFF_T_FMT
572572
" is larger than the configured limit"
573573
" of %" APR_OFF_T_FMT, ctx->limit_used, ctx->limit);
@@ -1471,12 +1471,12 @@ AP_DECLARE(int) ap_setup_client_block(request_rec *r, int read_policy)
14711471

14721472
if (tenc) {
14731473
if (strcasecmp(tenc, "chunked")) {
1474-
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1474+
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
14751475
"Unknown Transfer-Encoding %s", tenc);
14761476
return HTTP_NOT_IMPLEMENTED;
14771477
}
14781478
if (r->read_body == REQUEST_CHUNKED_ERROR) {
1479-
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1479+
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
14801480
"chunked Transfer-Encoding forbidden: %s", r->uri);
14811481
return (lenp) ? HTTP_BAD_REQUEST : HTTP_LENGTH_REQUIRED;
14821482
}
@@ -1489,15 +1489,15 @@ AP_DECLARE(int) ap_setup_client_block(request_rec *r, int read_policy)
14891489
if (apr_strtoff(&r->remaining, lenp, &endstr, 10)
14901490
|| *endstr || r->remaining < 0) {
14911491
r->remaining = 0;
1492-
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1492+
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
14931493
"Invalid Content-Length");
14941494
return HTTP_BAD_REQUEST;
14951495
}
14961496
}
14971497

14981498
if ((r->read_body == REQUEST_NO_BODY)
14991499
&& (r->read_chunked || (r->remaining > 0))) {
1500-
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1500+
ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
15011501
"%s with body is not allowed for %s", r->method, r->uri);
15021502
return HTTP_REQUEST_ENTITY_TOO_LARGE;
15031503
}

‎modules/http/http_request.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ void ap_process_request(request_rec *r)
376376
* It is still safe to use r / r->pool here as the eor bucket
377377
* could not have been destroyed in the event of a timeout.
378378
*/
379-
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
379+
ap_log_rerror(APLOG_MARK, APLOG_INFO, rv, r,
380380
"Timeout while writing data for URI %s to the"
381381
" client", r->unparsed_uri);
382382
}

0 commit comments

Comments
 (0)