commit 470540b5bebdd99ea721e4038ccf62d55c4531ec
author Piotr Sikora <piotrsikora@google.com> Wed Mar 15 14:49:24 2017 -0700
committer Piotr Sikora <piotrsikora@google.com> Sun Mar 26 08:56:37 2017 +0000
tree 257d6eebcb1b7df8d9a48a29dd9b04a04ad1bbf4
parent d110213e8db12853cbe94654d01370c473579ec1

HTTP/2: reject HTTP/2 requests with "Connection" header.

While there, populate r->headers_in.connection.

Change-Id: Icfe42f019081d254c0a4a157d829e39cf9ddc875
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Reviewed-on: https://nginx-review.googlesource.com/2827
Reviewed-by: Lizan Zhou <zlizan@google.com>

src/http/ngx_http_request.c

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index d1012ad..a9a9206 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1673,6 +1673,22 @@
 ngx_http_process_connection(ngx_http_request_t *r, ngx_table_elt_t *h,
     ngx_uint_t offset)
 {
+    if (r->headers_in.connection == NULL) {
+        r->headers_in.connection = h;
+    }
+
+#if (NGX_HTTP_V2)
+
+    if (r->http_version >= NGX_HTTP_VERSION_20) {
+        ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
+                      "client sent HTTP/2 request with \"Connection\" header");
+
+        ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
+        return NGX_ERROR;
+    }
+
+#endif
+
     if (ngx_strcasestrn(h->value.data, "close", 5 - 1)) {
         r->headers_in.connection_type = NGX_HTTP_CONNECTION_CLOSE;