details: http://hg.nginx.org/nginx/rev/8801ff7d58e1
branches:
changeset: 6993:8801ff7d58e1
user: Ruslan Ermilov <ru@nginx.com>
date: Tue Apr 25 23:39:13 2017 +0300
description:
Don't pretend we support HTTP major versions >1 as HTTP/1.1.
diffstat:
src/http/ngx_http_header_filter_module.c | 2 +-
src/http/ngx_http_parse.c | 12 +++++++++---
src/http/ngx_http_request.c | 12 +++++++++++-
src/http/ngx_http_request.h | 6 ++++--
src/http/ngx_http_special_response.c | 10 +++++++++-
5 files changed, 34 insertions(+), 8 deletions(-)
diffs (123 lines):
diff -r 330b6c33a5c4 -r 8801ff7d58e1 src/http/ngx_http_header_filter_module.c
--- a/src/http/ngx_http_header_filter_module.c Tue Apr 25 23:39:06 2017 +0300
+++ b/src/http/ngx_http_header_filter_module.c Tue Apr 25 23:39:13 2017 +0300
@@ -119,7 +119,7 @@ static ngx_str_t ngx_http_status_lines[]
ngx_string("502 Bad Gateway"),
ngx_string("503 Service Temporarily Unavailable"),
ngx_string("504 Gateway Time-out"),
- ngx_null_string, /* "505 HTTP Version Not Supported" */
+ ngx_string("505 HTTP Version Not Supported"),
ngx_null_string, /* "506 Variant Also Negotiates" */
ngx_string("507 Insufficient Storage"),
diff -r 330b6c33a5c4 -r 8801ff7d58e1 src/http/ngx_http_parse.c
--- a/src/http/ngx_http_parse.c Tue Apr 25 23:39:06 2017 +0300
+++ b/src/http/ngx_http_parse.c Tue Apr 25 23:39:13 2017 +0300
@@ -723,6 +723,11 @@ ngx_http_parse_request_line(ngx_http_req
}
r->http_major = ch - '0';
+
+ if (r->http_major > 1) {
+ return NGX_HTTP_PARSE_INVALID_VERSION;
+ }
+
state = sw_major_digit;
break;
@@ -737,11 +742,12 @@ ngx_http_parse_request_line(ngx_http_req
return NGX_HTTP_PARSE_INVALID_REQUEST;
}
- if (r->http_major > 99) {
- return NGX_HTTP_PARSE_INVALID_REQUEST;
+ r->http_major = r->http_major * 10 + ch - '0';
+
+ if (r->http_major > 1) {
+ return NGX_HTTP_PARSE_INVALID_VERSION;
}
- r->http_major = r->http_major * 10 + ch - '0';
break;
/* first digit of minor HTTP version */
diff -r 330b6c33a5c4 -r 8801ff7d58e1 src/http/ngx_http_request.c
--- a/src/http/ngx_http_request.c Tue Apr 25 23:39:06 2017 +0300
+++ b/src/http/ngx_http_request.c Tue Apr 25 23:39:13 2017 +0300
@@ -72,6 +72,9 @@ static char *ngx_http_client_errors[] =
/* NGX_HTTP_PARSE_INVALID_REQUEST */
"client sent invalid request",
+ /* NGX_HTTP_PARSE_INVALID_VERSION */
+ "client sent invalid version",
+
/* NGX_HTTP_PARSE_INVALID_09_METHOD */
"client sent invalid method in HTTP/0.9 request"
};
@@ -1036,7 +1039,14 @@ ngx_http_process_request_line(ngx_event_
ngx_log_error(NGX_LOG_INFO, c->log, 0,
ngx_http_client_errors[rc - NGX_HTTP_CLIENT_ERROR]);
- ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+
+ if (rc == NGX_HTTP_PARSE_INVALID_VERSION) {
+ ngx_http_finalize_request(r, NGX_HTTP_VERSION_NOT_SUPPORTED);
+
+ } else {
+ ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+ }
+
return;
}
diff -r 330b6c33a5c4 -r 8801ff7d58e1 src/http/ngx_http_request.h
--- a/src/http/ngx_http_request.h Tue Apr 25 23:39:06 2017 +0300
+++ b/src/http/ngx_http_request.h Tue Apr 25 23:39:13 2017 +0300
@@ -54,9 +54,10 @@
#define NGX_HTTP_CLIENT_ERROR 10
#define NGX_HTTP_PARSE_INVALID_METHOD 10
#define NGX_HTTP_PARSE_INVALID_REQUEST 11
-#define NGX_HTTP_PARSE_INVALID_09_METHOD 12
+#define NGX_HTTP_PARSE_INVALID_VERSION 12
+#define NGX_HTTP_PARSE_INVALID_09_METHOD 13
-#define NGX_HTTP_PARSE_INVALID_HEADER 13
+#define NGX_HTTP_PARSE_INVALID_HEADER 14
/* unused 1 */
@@ -136,6 +137,7 @@
#define NGX_HTTP_BAD_GATEWAY 502
#define NGX_HTTP_SERVICE_UNAVAILABLE 503
#define NGX_HTTP_GATEWAY_TIME_OUT 504
+#define NGX_HTTP_VERSION_NOT_SUPPORTED 505
#define NGX_HTTP_INSUFFICIENT_STORAGE 507
diff -r 330b6c33a5c4 -r 8801ff7d58e1 src/http/ngx_http_special_response.c
--- a/src/http/ngx_http_special_response.c Tue Apr 25 23:39:06 2017 +0300
+++ b/src/http/ngx_http_special_response.c Tue Apr 25 23:39:13 2017 +0300
@@ -321,6 +321,14 @@ static char ngx_http_error_504_page[] =
;
+static char ngx_http_error_505_page[] =
+"<html>" CRLF
+"<head><title>505 HTTP Version Not Supported</title></head>" CRLF
+"<body bgcolor=\"white\">" CRLF
+"<center><h1>505 HTTP Version Not Supported</h1></center>" CRLF
+;
+
+
static char ngx_http_error_507_page[] =
"<html>" CRLF
"<head><title>507 Insufficient Storage</title></head>" CRLF
@@ -395,7 +403,7 @@ static ngx_str_t ngx_http_error_pages[]
ngx_string(ngx_http_error_502_page),
ngx_string(ngx_http_error_503_page),
ngx_string(ngx_http_error_504_page),
- ngx_null_string, /* 505 */
+ ngx_string(ngx_http_error_505_page),
ngx_null_string, /* 506 */
ngx_string(ngx_http_error_507_page)
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
