IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

do not discard body while error_page redirection

Browse Source
This commit is contained in:
Igor Sysoev 2008-08-19 12:23:18 +00:00
parent 1de8bb5bd6
commit c9482c6ead
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http/ngx_http_special_response.c
View File

@ -327,7 +327,6 @@ static ngx_str_t ngx_http_get_name = { 3, (u_char *) "GET " };
ngx_int_t ngx_int_t
ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error) ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
{ {
ngx_int_t rc;
ngx_uint_t i, err; ngx_uint_t i, err;
ngx_http_err_page_t *err_page; ngx_http_err_page_t *err_page;
ngx_http_core_loc_conf_t *clcf; ngx_http_core_loc_conf_t *clcf;
@ -336,12 +335,6 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
"http special response: %d, \"%V?%V\"", "http special response: %d, \"%V?%V\"",
error, &r->uri, &r->args); error, &r->uri, &r->args);
rc = ngx_http_discard_request_body(r);
if (rc == NGX_HTTP_INTERNAL_SERVER_ERROR) {
error = NGX_HTTP_INTERNAL_SERVER_ERROR;
}
r->err_status = error; r->err_status = error;
if (r->keepalive) { if (r->keepalive) {
@ -386,6 +379,10 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
} }
} }
if (ngx_http_discard_request_body(r) != NGX_OK) {
error = NGX_HTTP_INTERNAL_SERVER_ERROR;
}
if (clcf->msie_refresh if (clcf->msie_refresh
&& r->headers_in.msie && r->headers_in.msie
&& (error == NGX_HTTP_MOVED_PERMANENTLY && (error == NGX_HTTP_MOVED_PERMANENTLY