Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

set "Content-Length: 0" for errors handled by "return 204"

Browse source
This commit is contained in:
Igor Sysoev 2006-10-02 10:22:51 +00:00
parent 537a359d58
commit 85e48a977d
3 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/http/ngx_http_request.h
View file

@ -430,6 +430,7 @@ 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;

1
src/http/ngx_http_script.c
View file

@ -841,6 +841,7 @@ ngx_http_script_return_code(ngx_http_script_engine_t *e)
if (code->status == NGX_HTTP_NO_CONTENT) { if (code->status == NGX_HTTP_NO_CONTENT) {
e->request->header_only = 1; e->request->header_only = 1;
e->request->zero_body = 1;
} }
e->ip += sizeof(ngx_http_script_return_code_t) - sizeof(uintptr_t); e->ip += sizeof(ngx_http_script_return_code_t) - sizeof(uintptr_t);

9
src/http/ngx_http_special_response.c
View file

@ -455,6 +455,7 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
msie_padding = 0; msie_padding = 0;
if (!r->zero_body) {
if (error_pages[err].len) { if (error_pages[err].len) {
r->headers_out.content_length_n = error_pages[err].len r->headers_out.content_length_n = error_pages[err].len
+ sizeof(error_tail) - 1; + sizeof(error_tail) - 1;
@ -465,7 +466,8 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
&& error >= NGX_HTTP_BAD_REQUEST && error >= NGX_HTTP_BAD_REQUEST
&& error != NGX_HTTP_REQUEST_URI_TOO_LARGE) && error != NGX_HTTP_REQUEST_URI_TOO_LARGE)
{ {
r->headers_out.content_length_n += sizeof(ngx_http_msie_stub) - 1; r->headers_out.content_length_n +=
sizeof(ngx_http_msie_stub) - 1;
msie_padding = 1; msie_padding = 1;
} }
@ -476,6 +478,11 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
r->headers_out.content_length_n = -1; r->headers_out.content_length_n = -1;
} }
} else {
r->headers_out.content_length_n = 0;
err = 0;
}
if (r->headers_out.content_length) { if (r->headers_out.content_length) {
r->headers_out.content_length->hash = 0; r->headers_out.content_length->hash = 0;
r->headers_out.content_length = NULL; r->headers_out.content_length = NULL;