feature: make HTTP3 authority as http_host header.

Author: zhuizhuhaomeng

src/ngx_http_lua_headers.c

@@ -782,6 +782,11 @@ ngx_http_lua_ffi_req_get_headers_count(ngx_http_request_t *r, int max,
 {
     int                           count;
     ngx_list_part_t              *part;
+#if (NGX_HTTP_V3)
+    int                           has_host = 0;
+    ngx_uint_t                    i;
+    ngx_table_elt_t              *header;
+#endif
 
     if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
@@ -794,11 +799,54 @@ ngx_http_lua_ffi_req_get_headers_count(ngx_http_request_t *r, int max,
     }
 
     part = &r->headers_in.headers.part;
+
+#if (NGX_HTTP_V3)
+    count = 0;
+    header = part->elts;
+
+    if (r->http_version == NGX_HTTP_VERSION_30
+        && r->headers_in.server.data != NULL)
+    {
+        has_host = 1;
+        count++;
+    }
+
+    if (has_host == 1) {
+        for (i = 0; /* void */; i++) {
+            if (i >= part->nelts) {
+                if (part->next == NULL) {
+                    break;
+                }
+
+                part = part->next;
+                header = part->elts;
+                i = 0;
+            }
+
+            if (header[i].key.len == 4
+                && ngx_strncasecmp(header[i].key.data,
+                                   (u_char *) "host", 4) == 0)
+            {
+                continue;
+            }
+
+            count++;
+        }
+
+    } else {
+        count = part->nelts;
+        while (part->next != NULL) {
+            part = part->next;
+            count += part->nelts;
+        }
+    }
+#else
     count = part->nelts;
     while (part->next != NULL) {
         part = part->next;
         count += part->nelts;
     }
+#endif
 
     if (max > 0 && count > max) {
         *truncated = 1;
@@ -821,12 +869,29 @@ ngx_http_lua_ffi_req_get_headers(ngx_http_request_t *r,
     ngx_uint_t                    i;
     ngx_list_part_t              *part;
     ngx_table_elt_t              *header;
+#if (NGX_HTTP_V3)
+    int                           has_host = 0;
+#endif
 
     if (count <= 0) {
         return NGX_OK;
     }
 
     n = 0;
+
+#if (NGX_HTTP_V3)
+    if (r->http_version == NGX_HTTP_VERSION_30
+        && r->headers_in.server.data != NULL)
+    {
+        out[n].key.data = (u_char *) "host";
+        out[n].key.len = sizeof("host") - 1;
+        out[n].value.len = r->headers_in.server.len;
+        out[n].value.data = r->headers_in.server.data;
+        has_host = 1;
+        ++n;
+    }
+#endif
+
     part = &r->headers_in.headers.part;
     header = part->elts;
 
@@ -842,6 +907,14 @@ ngx_http_lua_ffi_req_get_headers(ngx_http_request_t *r,
             i = 0;
         }
 
+#if (NGX_HTTP_V3)
+        if (has_host == 1 && header[i].key.len == 4
+            && ngx_strncasecmp(header[i].key.data, (u_char *) "host", 4) == 0)
+        {
+            continue;
+        }
+#endif
+
         if (raw) {
             out[n].key.data = header[i].key.data;
             out[n].key.len = (int) header[i].key.len;

src/ngx_http_lua_subrequest.c

@@ -52,6 +52,8 @@ ngx_str_t  ngx_http_lua_patch_method =
 ngx_str_t  ngx_http_lua_trace_method =
         ngx_http_lua_method_name("TRACE");
 
+ngx_str_t host_header = ngx_string("host");
+
 
 static ngx_str_t  ngx_http_lua_content_length_header_key =
     ngx_string("Content-Length");
@@ -1699,6 +1701,17 @@ ngx_http_lua_copy_request_headers(ngx_http_request_t *sr,
     part = &pr->headers_in.headers.part;
     header = part->elts;
 
+#if (NGX_HTTP_V3)
+    if (pr->headers_in.server.data != NULL) {
+        if (ngx_http_lua_set_input_header(sr, host_header,
+                                          pr->headers_in.server, 0)
+            == NGX_ERROR)
+        {
+            return NGX_ERROR;
+        }
+    }
+#endif
+
     for (i = 0; /* void */; i++) {
 
         if (i >= part->nelts) {

src/ngx_http_lua_variable.c

@@ -70,6 +70,18 @@ ngx_http_lua_ffi_var_get(ngx_http_request_t *r, u_char *name_data,
     }
 #endif
 
+#if (NGX_HTTP_V3)
+    if (name_len == 9
+        && r->http_version == NGX_HTTP_VERSION_30
+        && ngx_strncasecmp(name_data, (u_char *) "http_host", 9) == 0
+        && r->headers_in.server.data != NULL)
+    {
+        *value = r->headers_in.server.data;
+        *value_len = r->headers_in.server.len;
+        return NGX_OK;
+    }
+#endif
+
     hash = ngx_hash_strlow(lowcase_buf, name_data, name_len);
 
     name.data = lowcase_buf;

t/001-set.t

@@ -389,8 +389,8 @@ GET /lua
 GET /lua
 --- response_body_like: 500 Internal Server Error
 --- error_code: 500
---- error_log
-API disabled in the context of set_by_lua*
+--- error_log eval
+qr/(?:API disabled in the context of set_by_lua\*|http3 requests are not supported without content-length header)/ms
 
 
 

t/005-exit.t

@@ -774,6 +774,8 @@ GET /t
 --- response_body
 --- no_error_log
 [error]
+--- curl_error
+curl: (95) HTTP/3 stream 0 reset by server
 
 
 
@@ -790,6 +792,8 @@ GET /t
 --- response_body
 --- no_error_log
 [error]
+--- curl_error
+curl: (95) HTTP/3 stream 0 reset by server
 
 
 

t/010-request_body.t

@@ -270,6 +270,7 @@ Expect: 100-Continue
 http finalize request: 500, "/echo_body?" a:1, c:2
 http finalize request: 500, "/echo_body?" a:1, c:0
 --- log_level: debug
+--- skip_eval: 4:$ENV{TEST_NGINX_USE_HTTP3}
 
 
 
@@ -281,9 +282,10 @@ http finalize request: 500, "/echo_body?" a:1, c:0
             local data = ngx.req.get_body_data(1)
             ngx.say(data)
         }
-    } 
+    }
 --- request
 POST /echo_body
 hello
 --- response_body
 h
+--- skip_eval: 2:$ENV{TEST_NGINX_USE_HTTP3}

t/014-bugs.t

@@ -885,6 +885,7 @@ GET /t
 --- no_error_log
 [error]
 --- timeout: 10
+--- skip_eval: 3:$ENV{TEST_NGINX_USE_HTTP3}
 
 
 
@@ -1305,8 +1306,17 @@ location /t {
 --- response_body
 Hello world
 --- shutdown_error_log eval
-qr|failed to read a line: closed|
+my $expr;
+
+if ($ENV{TEST_NGINX_USE_HTTP3}) {
+    $expr = qr|lua close the global Lua VM|
+} else {
+    $expr = qr|failed to read a line: closed|
+}
+
+$expr;
 --- timeout: 1.2
+--- skip_eval: 2:$ENV{TEST_NGINX_USE_HTTP3}
 
 
 

t/016-resp-header.t

@@ -2209,8 +2209,8 @@ upstream prematurely closed connection while sending to client
 Foo
 --- request
 GET /a.txt
---- raw_response_headers_like chomp
-Age: \d\r\n
+--- raw_response_headers_like eval
+qr/^(a|A)ge: \d\r\n/ms
 --- no_error_log
 [error]
 
@@ -2240,8 +2240,8 @@ Age: \d\r\n
 Foo
 --- request
 GET /test/a.txt
---- raw_response_headers_like chomp
-Age: \d\r\n
+--- raw_response_headers_like eval
+qr/^(a|A)ge: \d\r\n/ms
 --- no_error_log
 [error]
 

t/020-subrequest.t

@@ -1227,8 +1227,8 @@ F(ngx_http_finalize_request) {
 --- error_code
 --- no_error_log
 [error]
---- curl_error
-curl: (52) Empty reply from server
+--- curl_error eval
+qr{(\Qcurl: (52) Empty reply from server\E|\Qcurl: (95) HTTP/3 stream 0 reset by server\E)}ms
 
 
 
@@ -2340,6 +2340,7 @@ hello world
 nil
 --- no_error_log
 [error]
+--- skip_eval: 3:$ENV{TEST_NGINX_USE_HTTP3}
 
 
 

t/023-rewrite/req-body.t

@@ -125,6 +125,7 @@ Expect: 100-Continue
 [alert]
 [error]
 http finalize request: 500, "/test?" a:1, c:0
+--- skip_eval: 3:$ENV{TEST_NGINX_USE_HTTP3}