From 8283707a4f9fd5d5e3f75fdd9503f82885754720 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sun, 30 Dec 2012 01:28:17 +0000 Subject: [PATCH] add log tags missing in r1426877 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1426879 13f79535-47bb-0310-9956-ffa450edef68 --- docs/log-message-tags/next-number | 2 +- modules/http/http_filters.c | 8 ++++---- server/protocol.c | 20 ++++++++++---------- server/vhost.c | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index 49ce078f63..e576ab3169 100644 --- a/docs/log-message-tags/next-number +++ b/docs/log-message-tags/next-number @@ -1 +1 @@ -2413 +2432 diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c index 19c4c0a2c8..71c893afe0 100644 --- a/modules/http/http_filters.c +++ b/modules/http/http_filters.c @@ -650,13 +650,13 @@ static int check_header(void *arg, const char *name, const char *val) struct check_header_ctx *ctx = arg; if (name[0] == '\0') { ctx->error = 1; - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(02428) "Empty response header name, aborting request"); return 0; } if (ap_has_cntrl(name)) { ctx->error = 1; - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(02429) "Response header name '%s' contains control " "characters, aborting request", name); @@ -664,7 +664,7 @@ static int check_header(void *arg, const char *name, const char *val) } if (ap_has_cntrl(val)) { ctx->error = 1; - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(02430) "Response header '%s' contains control characters, " "aborting request: %s", name, val); @@ -711,7 +711,7 @@ static APR_INLINE int check_headers(request_rec *r) return 1; bad: - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02431) "Bad Location header in response: '%s', aborting request", loc); return 0; diff --git a/server/protocol.c b/server/protocol.c index ed9b3486f5..c0adfbb9a6 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -682,7 +682,7 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) */ if (nmatch < 3 || (strcmp("HTTP", http) != 0) || (minor >= HTTP_VERSION(1, 0)) ) { /* don't allow HTTP/0.1000 */ - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02418) "Invalid protocol: %s", r->protocol); if (enforce_strict) { r->status = HTTP_NOT_IMPLEMENTED; @@ -693,7 +693,7 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) while (r->protocol[pos] == ' ') pos++; if (r->protocol[pos] != '\0') { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02419) "Garbage after request line: ... %s", r->protocol); if (enforce_strict) { @@ -716,28 +716,28 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) if (strict) { int err = 0; if (ap_has_cntrl(r->the_request)) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02420) "Request line must not contain control characters"); err = HTTP_BAD_REQUEST; } if (r->parsed_uri.fragment) { /* RFC3986 3.5: no fragment */ - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02421) "URI must not contain a fragment"); err = HTTP_BAD_REQUEST; } else if (r->parsed_uri.user || r->parsed_uri.password) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02422) "URI must not contain a username/password"); err = HTTP_BAD_REQUEST; } else if (r->method_number == M_INVALID) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02423) "Invalid HTTP method string: %s", r->method); err = HTTP_NOT_IMPLEMENTED; } else if (r->assbackwards == 0 && r->proto_num < HTTP_VERSION(1, 0)) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02424) "HTTP/0.x does not take a protocol"); err = HTTP_BAD_REQUEST; } @@ -944,19 +944,19 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb if (*last_field == '\0') { err = HTTP_BAD_REQUEST; - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02425) "Empty request header field name not allowed"); } else if (ap_has_cntrl(last_field)) { err = HTTP_BAD_REQUEST; - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02426) "[HTTP strict] Request header field name contains " "control character: %.*s", (int)LOG_NAME_MAX_LEN, last_field); } else if (ap_has_cntrl(value)) { err = HTTP_BAD_REQUEST; - ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(02427) "Request header field '%.*s' contains" "control character", (int)LOG_NAME_MAX_LEN, last_field); diff --git a/server/vhost.c b/server/vhost.c index ff2047fe57..fca2d331a3 100644 --- a/server/vhost.c +++ b/server/vhost.c @@ -780,7 +780,7 @@ static apr_status_t strict_hostname_check(request_rec *r, char *host, return APR_SUCCESS; bad: - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02415) "[strict] Invalid host name '%s'%s%.6s", host, *ch ? ", problem near: " : "", ch); if (logonly) @@ -831,7 +831,7 @@ static int fix_hostname(request_rec *r, const char *host_header, /* pure integer */ if (strict) { /* RFC 3986 7.4 */ - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02416) "[strict] purely numeric host names not allowed: %s", src); if (!strict_logonly) @@ -1166,7 +1166,7 @@ AP_DECLARE(void) ap_update_vhost_from_headers(request_rec *r) apr_table_set(r->headers_in, "Host", r->hostname); info = "Replacing"; } - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02417) "%s Host header '%s' with host from request uri: " "'%s'", info, host_header, new); } -- 2.40.0