# HG changeset patch # User Igor Sysoev # Date 1292354108 0 # Node ID 9ccda889a355032214602e760bf097759b3fd623 # Parent e122e166987fa15d8f643e88511cf5b24873a10f 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 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 @@ -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 --- 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_ 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;