diff options
author | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 19:15:08 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 19:15:08 +0000 |
commit | 772ecd6cc60d98df3a48daaef2b3c1e048a76372 (patch) | |
tree | de1029a1e289eaee3031a21edd60edf9c193dbd3 | |
parent | d60cb3f9f7098ce3bbe0fa63bd4448a1d73ec08d (diff) | |
download | nginx-772ecd6cc60d98df3a48daaef2b3c1e048a76372.tar.gz |
set r->valid_unparsed_uri just after request line processing,
it allows to use X-Accel-Redirect'ed URI in a proxy_pass without URI part
this fix corresponds to r3616
-rw-r--r-- | src/http/ngx_http_core_module.c | 4 | ||||
-rw-r--r-- | src/http/ngx_http_request.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 479592a85..caf8c273d 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -785,10 +785,6 @@ ngx_http_handler(ngx_http_request_t *r) r->phase_handler = cmcf->phase_engine.server_rewrite_index; } - if (r->unparsed_uri.len) { - r->valid_unparsed_uri = 1; - } - r->valid_location = 1; #if (NGX_HTTP_GZIP) r->gzip_tested = 0; diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 5710c699f..7a18980c4 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -752,6 +752,7 @@ ngx_http_process_request_line(ngx_event_t *rev) r->unparsed_uri.len = r->uri_end - r->uri_start; r->unparsed_uri.data = r->uri_start; + r->valid_unparsed_uri = 1; r->method_name.len = r->method_end - r->request_start + 1; r->method_name.data = r->request_line.data; |