From 0db94ba96a00ebfc4a3c55af8eaaf20f971a7c4c Mon Sep 17 00:00:00 2001 From: Vladimir Khomutov Date: Tue, 28 Nov 2023 12:57:14 +0300 Subject: [PATCH] HTTP: removed unused r->port_start and r->port_end. Neither r->port_start nor r->port_end were ever used. The r->port_end is set by the parser, though it was never used by the following code (and was never usable, since not copied by the ngx_http_alloc_large_header_buffer() without r->port_start set). --- src/http/ngx_http_parse.c | 3 --- src/http/ngx_http_request.c | 5 ----- src/http/ngx_http_request.h | 2 -- 3 files changed, 10 deletions(-) diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c index d4f2dae872..f7e50388f9 100644 --- a/src/http/ngx_http_parse.c +++ b/src/http/ngx_http_parse.c @@ -451,19 +451,16 @@ ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b) switch (ch) { case '/': - r->port_end = p; r->uri_start = p; state = sw_after_slash_in_uri; break; case '?': - r->port_end = p; r->uri_start = p; r->args_start = p + 1; r->empty_path_in_uri = 1; state = sw_uri; break; case ' ': - r->port_end = p; /* * use single "/" from request line to preserve pointers, * if request line will be copied to large client buffer diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index bd2be5eacd..058d502866 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1735,11 +1735,6 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r, } } - if (r->port_start) { - r->port_start = new + (r->port_start - old); - r->port_end = new + (r->port_end - old); - } - if (r->uri_ext) { r->uri_ext = new + (r->uri_ext - old); } diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h index cc3b7c0acb..48b052bbc5 100644 --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -597,8 +597,6 @@ struct ngx_http_request_s { u_char *schema_end; u_char *host_start; u_char *host_end; - u_char *port_start; - u_char *port_end; unsigned http_minor:16; unsigned http_major:16;