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
index c132a2d5299fa27c649f1b500b7315619fa43377..0cc9c7ffa3fdc3e68f0cb4caa9d2c5d2af541660 100644 (file)
--- 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 *r,
 
     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
index 08ccd1348176953d5dc99a045c7271c64462a0ae..204d62f09a03edcd4c31e1ac5d2c9b782fba1fd6 100644 (file)
--- 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];