diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2016-12-22 23:24:40 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2016-12-22 23:24:40 +0000 |
| commit | 1930d192d782637492ad5e729bfb1085363dd7f6 (patch) | |
| tree | 52925043da07f4c95f9832e7c2784523de734823 | |
| parent | a6160180773ac94c2d5858b7b6bc6204368aef9b (diff) | |
| download | httpd-1930d192d782637492ad5e729bfb1085363dd7f6.tar.gz | |
Clean up assorted merge-duplications and whitespace to sync at 2.4.24-dev.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775774 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | server/protocol.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/server/protocol.c b/server/protocol.c index 31923c1653..dafc25d06d 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -660,16 +660,6 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) return 1; } -/* get the length of the field name for logging, but no more than 80 bytes */ -#define LOG_NAME_MAX_LEN 80 -static int field_name_len(const char *field) -{ - const char *end = ap_strchr_c(field, ':'); - if (end == NULL || end - field > LOG_NAME_MAX_LEN) - return LOG_NAME_MAX_LEN; - return end - field; -} - static int table_do_fn_check_lengths(void *r_, const char *key, const char *value) { @@ -751,17 +741,14 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb apr_psprintf(r->pool, "Size of a request header field " "exceeds server limit.<br />\n" - "<pre>\n%.*s\n</pre>/n", + "<pre>\n%.*s\n</pre>\n", field_name_len(field_escaped), field_escaped)); - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "Request header exceeds LimitRequestFieldSize%s" "%.*s", *field ? ": " : "", field_name_len(field), field); - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, - "Request header exceeds LimitRequestFieldSize: " - "%.*s", field_name_len(field), field); } return; } @@ -796,10 +783,6 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb "Request header exceeds LimitRequestFieldSize " "after folding: %.*s", field_name_len(last_field), last_field); - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, - "Request header exceeds LimitRequestFieldSize " - "after folding: %.*s", - field_name_len(last_field), last_field); return; } @@ -837,7 +820,7 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb apr_psprintf(r->pool, "Request header field is " "missing ':' separator.<br />\n" - "<pre>\n%.*s</pre>\n", + "<pre>\n%.*s</pre>\n", (int)LOG_NAME_MAX_LEN, ap_escape_html(r->pool, last_field))); @@ -845,11 +828,6 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb "Request header field is missing ':' " "separator: %.*s", (int)LOG_NAME_MAX_LEN, last_field); - - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, - "Request header field is missing ':' " - "separator: %.*s", (int)LOG_NAME_MAX_LEN, - last_field); return; } |