merge r3478:

reset a parsing state to parse correctly an upstream response,
if 400 or 414 response has been redirected to upstream
This commit is contained in:
Igor Sysoev 2010-06-07 11:45:04 +00:00
parent fc9853f61c
commit b61109cc00
1 changed files with 2 additions and 0 deletions

View File

@ -630,6 +630,7 @@ ngx_http_proxy_handler(ngx_http_request_t *r)
u->process_header = ngx_http_proxy_process_status_line;
u->abort_request = ngx_http_proxy_abort_request;
u->finalize_request = ngx_http_proxy_finalize_request;
r->state = 0;
if (plcf->redirects) {
u->rewrite_redirect = ngx_http_proxy_rewrite_redirect;
@ -1191,6 +1192,7 @@ ngx_http_proxy_reinit_request(ngx_http_request_t *r)
ctx->status_end = NULL;
r->upstream->process_header = ngx_http_proxy_process_status_line;
r->state = 0;
return NGX_OK;
}