# HG changeset patch # User Igor Sysoev # Date 1160658506 0 # Node ID 843412b22ba2f206182930fce4064e4096123724 # Parent c8f9913400533588ec768a14e350ce2b903a9571 compact r->http_minor and r->http_major diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1341,7 +1341,6 @@ ngx_http_subrequest(ngx_http_request_t * sr->method = NGX_HTTP_GET; sr->http_version = r->http_version; - sr->http_major = r->http_minor; sr->request_line = r->request_line; sr->uri = *uri; diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -330,8 +330,6 @@ struct ngx_http_request_s { ngx_uint_t method; ngx_uint_t http_version; - ngx_uint_t http_major; - ngx_uint_t http_minor; ngx_str_t request_line; ngx_str_t uri; @@ -456,6 +454,7 @@ struct ngx_http_request_s { unsigned subrequests:8; /* used to parse HTTP headers */ + ngx_uint_t state; u_char *uri_start; u_char *uri_end; @@ -475,6 +474,9 @@ struct ngx_http_request_s { u_char *header_start; u_char *header_end; + unsigned http_minor:16; + unsigned http_major:16; + ngx_uint_t header_hash; ngx_uint_t lowcase_index; u_char lowcase_header[NGX_HTTP_LC_HEADER_LEN];