diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2025-11-05 16:15:12 +0400 |
|---|---|---|
| committer | Roman Arutyunyan <arutyunyan.roman@gmail.com> | 2025-11-26 19:51:40 +0400 |
| commit | 6446f99107fff83469145b16983ebec99261a2db (patch) | |
| tree | 0936fa0668aeab030baa8018e0314c4d05fad79b /src/http/v3 | |
| parent | 511abb19e1e1b127f6d0943ccac346211a490a35 (diff) | |
| download | nginx-6446f99107fff83469145b16983ebec99261a2db.tar.gz nginx-6446f99107fff83469145b16983ebec99261a2db.tar.bz2 | |
Changed interface of ngx_http_validate_host().
This allows to process a port subcomponent and save it in r->port
in a unified way, similar to r->headers_in.server. For HTTP/1.x
request line in the absolute form, r->host_end now includes a port
subcomponent, which is also consistent with HTTP/2 and HTTP/3.
Diffstat (limited to 'src/http/v3')
| -rw-r--r-- | src/http/v3/ngx_http_v3_request.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/http/v3/ngx_http_v3_request.c b/src/http/v3/ngx_http_v3_request.c index 77c55bfee..6865e1466 100644 --- a/src/http/v3/ngx_http_v3_request.c +++ b/src/http/v3/ngx_http_v3_request.c @@ -904,6 +904,7 @@ ngx_http_v3_init_pseudo_headers(ngx_http_request_t *r) u_char *p; ngx_int_t rc; ngx_str_t host; + in_port_t port; if (r->request_line.len) { return NGX_OK; @@ -961,7 +962,7 @@ ngx_http_v3_init_pseudo_headers(ngx_http_request_t *r) host.len = r->host_end - r->host_start; host.data = r->host_start; - rc = ngx_http_validate_host(&host, r->pool, 0); + rc = ngx_http_validate_host(&host, &port, r->pool, 0); if (rc == NGX_DECLINED) { ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, @@ -979,16 +980,7 @@ ngx_http_v3_init_pseudo_headers(ngx_http_request_t *r) } r->headers_in.server = host; - - p = ngx_strlchr(r->host_start + host.len, r->host_end, ':'); - - if (p) { - rc = ngx_atoi(p + 1, r->host_end - p - 1); - - if (rc > 0 && rc < 65536) { - r->port = rc; - } - } + r->port = port; } if (ngx_list_init(&r->headers_in.headers, r->pool, 20, |