You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2012/12/30 02:28:18 UTC
svn commit: r1426879 - in /httpd/httpd/trunk:
docs/log-message-tags/next-number modules/http/http_filters.c
server/protocol.c server/vhost.c
Author: sf
Date: Sun Dec 30 01:28:17 2012
New Revision: 1426879
URL: http://svn.apache.org/viewvc?rev=1426879&view=rev
Log:
add log tags missing in r1426877
Modified:
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/http/http_filters.c
httpd/httpd/trunk/server/protocol.c
httpd/httpd/trunk/server/vhost.c
Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1426879&r1=1426878&r2=1426879&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Sun Dec 30 01:28:17 2012
@@ -1 +1 @@
-2413
+2432
Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1426879&r1=1426878&r2=1426879&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Sun Dec 30 01:28:17 2012
@@ -650,13 +650,13 @@ static int check_header(void *arg, const
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
}
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(requ
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;
Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1426879&r1=1426878&r2=1426879&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Sun Dec 30 01:28:17 2012
@@ -682,7 +682,7 @@ static int read_request_line(request_rec
*/
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
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
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_cor
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);
Modified: httpd/httpd/trunk/server/vhost.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/vhost.c?rev=1426879&r1=1426878&r2=1426879&view=diff
==============================================================================
--- httpd/httpd/trunk/server/vhost.c (original)
+++ httpd/httpd/trunk/server/vhost.c Sun Dec 30 01:28:17 2012
@@ -780,7 +780,7 @@ static apr_status_t strict_hostname_chec
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,
/* 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_he
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);
}