www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Downgrade some more error messages about broken client behavior to level

Browse Source 
info.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204630 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2011-11-21 18:16:01 +00:00
parent e0184da329
commit 2bffeda10b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/http/http_filters.c
View File

@@ -267,7 +267,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
/* Something that isn't in HTTP, unless some future /* Something that isn't in HTTP, unless some future
* edition defines new transfer ecodings, is unsupported. * edition defines new transfer ecodings, is unsupported.
*/ */
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r,
"Unknown Transfer-Encoding: %s", tenc); "Unknown Transfer-Encoding: %s", tenc);
return bail_out_on_error(ctx, f, HTTP_NOT_IMPLEMENTED); return bail_out_on_error(ctx, f, HTTP_NOT_IMPLEMENTED);
} }
@@ -289,7 +289,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
|| endstr == lenp || *endstr || ctx->remaining < 0) { || endstr == lenp || *endstr || ctx->remaining < 0) {
ctx->remaining = 0; ctx->remaining = 0;
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r,
"Invalid Content-Length"); "Invalid Content-Length");
return bail_out_on_error(ctx, f, HTTP_REQUEST_ENTITY_TOO_LARGE); 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,
* time, stop it here if it is invalid. * time, stop it here if it is invalid.
*/ */
if (ctx->limit && ctx->limit < ctx->remaining) { if (ctx->limit && ctx->limit < ctx->remaining) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r,
"Requested content-length of %" APR_OFF_T_FMT "Requested content-length of %" APR_OFF_T_FMT
" is larger than the configured limit" " is larger than the configured limit"
" of %" APR_OFF_T_FMT, ctx->remaining, ctx->limit); " 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,
/* Detect chunksize error (such as overflow) */ /* Detect chunksize error (such as overflow) */
if (rv != APR_SUCCESS || ctx->remaining < 0) { if (rv != APR_SUCCESS || ctx->remaining < 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "Error reading first chunk %s ", ap_log_rerror(APLOG_MARK, APLOG_INFO, rv, f->r, "Error reading first chunk %s ",
(ctx->remaining < 0) ? "(overflow)" : ""); (ctx->remaining < 0) ? "(overflow)" : "");
ctx->remaining = 0; /* Reset it in case we have to ctx->remaining = 0; /* Reset it in case we have to
* come back here later */ * come back here later */
@@ -498,7 +498,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
/* Detect chunksize error (such as overflow) */ /* Detect chunksize error (such as overflow) */
if (rv != APR_SUCCESS || ctx->remaining < 0) { if (rv != APR_SUCCESS || ctx->remaining < 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "Error reading chunk %s ", ap_log_rerror(APLOG_MARK, APLOG_INFO, rv, f->r, "Error reading chunk %s ",
(ctx->remaining < 0) ? "(overflow)" : ""); (ctx->remaining < 0) ? "(overflow)" : "");
ctx->remaining = 0; /* Reset it in case we have to ctx->remaining = 0; /* Reset it in case we have to
* come back here later */ * come back here later */
@@ -567,7 +567,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
* really count. This seems to be up for interpretation. */ * really count. This seems to be up for interpretation. */
ctx->limit_used += totalread; ctx->limit_used += totalread;
if (ctx->limit < ctx->limit_used) { if (ctx->limit < ctx->limit_used) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r,
"Read content-length of %" APR_OFF_T_FMT "Read content-length of %" APR_OFF_T_FMT
" is larger than the configured limit" " is larger than the configured limit"
" of %" APR_OFF_T_FMT, ctx->limit_used, ctx->limit); " 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)
if (tenc) { if (tenc) {
if (strcasecmp(tenc, "chunked")) { if (strcasecmp(tenc, "chunked")) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
"Unknown Transfer-Encoding %s", tenc); "Unknown Transfer-Encoding %s", tenc);
return HTTP_NOT_IMPLEMENTED; return HTTP_NOT_IMPLEMENTED;
} }
if (r->read_body == REQUEST_CHUNKED_ERROR) { if (r->read_body == REQUEST_CHUNKED_ERROR) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
"chunked Transfer-Encoding forbidden: %s", r->uri); "chunked Transfer-Encoding forbidden: %s", r->uri);
return (lenp) ? HTTP_BAD_REQUEST : HTTP_LENGTH_REQUIRED; return (lenp) ? HTTP_BAD_REQUEST : HTTP_LENGTH_REQUIRED;
} }
@@ -1489,7 +1489,7 @@ AP_DECLARE(int) ap_setup_client_block(request_rec *r, int read_policy)
if (apr_strtoff(&r->remaining, lenp, &endstr, 10) if (apr_strtoff(&r->remaining, lenp, &endstr, 10)
|| *endstr || r->remaining < 0) { || *endstr || r->remaining < 0) {
r->remaining = 0; r->remaining = 0;
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
"Invalid Content-Length"); "Invalid Content-Length");
return HTTP_BAD_REQUEST; return HTTP_BAD_REQUEST;
} }
@@ -1497,7 +1497,7 @@ AP_DECLARE(int) ap_setup_client_block(request_rec *r, int read_policy)
if ((r->read_body == REQUEST_NO_BODY) if ((r->read_body == REQUEST_NO_BODY)
&& (r->read_chunked || (r->remaining > 0))) { && (r->read_chunked || (r->remaining > 0))) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
"%s with body is not allowed for %s", r->method, r->uri); "%s with body is not allowed for %s", r->method, r->uri);
return HTTP_REQUEST_ENTITY_TOO_LARGE; return HTTP_REQUEST_ENTITY_TOO_LARGE;
} }

2
modules/http/http_request.c
View File

@@ -376,7 +376,7 @@ void ap_process_request(request_rec *r)
* It is still safe to use r / r->pool here as the eor bucket * It is still safe to use r / r->pool here as the eor bucket
* could not have been destroyed in the event of a timeout. * could not have been destroyed in the event of a timeout.
*/ */
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, ap_log_rerror(APLOG_MARK, APLOG_INFO, rv, r,
"Timeout while writing data for URI %s to the" "Timeout while writing data for URI %s to the"
" client", r->unparsed_uri); " client", r->unparsed_uri);
} }