mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 06:46:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove r->zero_body unused since the previous commit

Browse Source
This commit is contained in:
Igor Sysoev 2010-06-30 14:42:15 +00:00
parent ffcae99251
commit fb7b45d20e
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/http/ngx_http_request.h
View File

@ -489,7 +489,6 @@ struct ngx_http_request_s {
unsigned plain_http:1; unsigned plain_http:1;
unsigned chunked:1; unsigned chunked:1;
unsigned header_only:1; unsigned header_only:1;
unsigned zero_body:1;
unsigned keepalive:1; unsigned keepalive:1;
unsigned lingering_close:1; unsigned lingering_close:1;
unsigned discard_body:1; unsigned discard_body:1;

37
src/http/ngx_http_special_response.c
View File

@ -598,31 +598,24 @@ ngx_http_send_special_response(ngx_http_request_t *r,
msie_padding = 0; msie_padding = 0;
if (!r->zero_body) { if (ngx_http_error_pages[err].len) {
if (ngx_http_error_pages[err].len) { r->headers_out.content_length_n = ngx_http_error_pages[err].len + len;
r->headers_out.content_length_n = ngx_http_error_pages[err].len if (clcf->msie_padding
+ len; && (r->headers_in.msie || r->headers_in.chrome)
if (clcf->msie_padding && r->http_version >= NGX_HTTP_VERSION_10
&& (r->headers_in.msie || r->headers_in.chrome) && err >= NGX_HTTP_LEVEL_300)
&& r->http_version >= NGX_HTTP_VERSION_10 {
&& err >= NGX_HTTP_LEVEL_300) r->headers_out.content_length_n +=
{ sizeof(ngx_http_msie_padding) - 1;
r->headers_out.content_length_n += msie_padding = 1;
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;
} }
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 { } else {
r->headers_out.content_length_n = 0; r->headers_out.content_length_n = -1;
err = 0;
} }
if (r->headers_out.content_length) { if (r->headers_out.content_length) {