comparison src/http/modules/ngx_http_proxy_module.c @ 3589:1c2e8b92751d stable-0.7

merge r3478: reset a parsing state to parse correctly an upstream response, if 400 or 414 response has been redirected to upstream
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Jun 2010 11:45:04 +0000
parents 667c22171519
children 0d8b8c84bab7
comparison
equal deleted inserted replaced
3588:d0c46cafc201 3589:1c2e8b92751d
628 u->create_request = ngx_http_proxy_create_request; 628 u->create_request = ngx_http_proxy_create_request;
629 u->reinit_request = ngx_http_proxy_reinit_request; 629 u->reinit_request = ngx_http_proxy_reinit_request;
630 u->process_header = ngx_http_proxy_process_status_line; 630 u->process_header = ngx_http_proxy_process_status_line;
631 u->abort_request = ngx_http_proxy_abort_request; 631 u->abort_request = ngx_http_proxy_abort_request;
632 u->finalize_request = ngx_http_proxy_finalize_request; 632 u->finalize_request = ngx_http_proxy_finalize_request;
633 r->state = 0;
633 634
634 if (plcf->redirects) { 635 if (plcf->redirects) {
635 u->rewrite_redirect = ngx_http_proxy_rewrite_redirect; 636 u->rewrite_redirect = ngx_http_proxy_rewrite_redirect;
636 } 637 }
637 638
1189 ctx->status_count = 0; 1190 ctx->status_count = 0;
1190 ctx->status_start = NULL; 1191 ctx->status_start = NULL;
1191 ctx->status_end = NULL; 1192 ctx->status_end = NULL;
1192 1193
1193 r->upstream->process_header = ngx_http_proxy_process_status_line; 1194 r->upstream->process_header = ngx_http_proxy_process_status_line;
1195 r->state = 0;
1194 1196
1195 return NGX_OK; 1197 return NGX_OK;
1196 } 1198 }
1197 1199
1198 1200