summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-06-07 11:45:04 +0000
committerIgor Sysoev <igor@sysoev.ru>2010-06-07 11:45:04 +0000
commit4fd0e896db3907370f2f2705f893a7dee50ef9ba (patch)
tree7f01f95769ac1b69635606dfe23e5dfaba6387b1
parentce5508a3f486e4d7c5bc42f600f1dcfc6aa7654f (diff)
downloadnginx-4fd0e896db3907370f2f2705f893a7dee50ef9ba.tar.gz
merge r3478:
reset a parsing state to parse correctly an upstream response, if 400 or 414 response has been redirected to upstream
-rw-r--r--src/http/modules/ngx_http_proxy_module.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 03750784c..65c708662 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -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;
}