diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-30 18:42:15 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-30 18:42:15 +0400 |
| commit | fb7b45d20e322717b7273b981621b3f9ee3a02a4 (patch) | |
| tree | ae01eecd8a431e2a70b4507af6443448a08d198e | |
| parent | ffcae99251e5f74d73a9aa56012a924aae0076d5 (diff) | |
remove r->zero_body unused since the previous commit
| -rw-r--r-- | src/http/ngx_http_request.h | 1 | ||||
| -rw-r--r-- | src/http/ngx_http_special_response.c | 37 |
2 files changed, 15 insertions, 23 deletions
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h index ec2405b96..01826668c 100644 --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -489,7 +489,6 @@ struct ngx_http_request_s { unsigned plain_http:1; unsigned chunked:1; unsigned header_only:1; - unsigned zero_body:1; unsigned keepalive:1; unsigned lingering_close:1; unsigned discard_body:1; diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c index 7718d19a7..1b7eacec6 100644 --- a/src/http/ngx_http_special_response.c +++ b/src/http/ngx_http_special_response.c @@ -598,31 +598,24 @@ ngx_http_send_special_response(ngx_http_request_t *r, msie_padding = 0; - if (!r->zero_body) { - if (ngx_http_error_pages[err].len) { - r->headers_out.content_length_n = ngx_http_error_pages[err].len - + len; - if (clcf->msie_padding - && (r->headers_in.msie || r->headers_in.chrome) - && r->http_version >= NGX_HTTP_VERSION_10 - && err >= NGX_HTTP_LEVEL_300) - { - r->headers_out.content_length_n += - sizeof(ngx_http_msie_padding) - 1; - msie_padding = 1; - } - - r->headers_out.content_type_len = sizeof("text/html") - 1; - ngx_str_set(&r->headers_out.content_type, "text/html"); - r->headers_out.content_type_lowcase = NULL; - - } else { - r->headers_out.content_length_n = -1; + if (ngx_http_error_pages[err].len) { + r->headers_out.content_length_n = ngx_http_error_pages[err].len + len; + if (clcf->msie_padding + && (r->headers_in.msie || r->headers_in.chrome) + && r->http_version >= NGX_HTTP_VERSION_10 + && err >= NGX_HTTP_LEVEL_300) + { + r->headers_out.content_length_n += + sizeof(ngx_http_msie_padding) - 1; + msie_padding = 1; } + r->headers_out.content_type_len = sizeof("text/html") - 1; + ngx_str_set(&r->headers_out.content_type, "text/html"); + r->headers_out.content_type_lowcase = NULL; + } else { - r->headers_out.content_length_n = 0; - err = 0; + r->headers_out.content_length_n = -1; } if (r->headers_out.content_length) { |