aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2011-09-27 11:14:02 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2011-09-27 11:14:02 +0000
commit4a3884ae56cae78db8746ed7fbdce97554ee368f (patch)
treecc8429c66cdb82de314c3849d79ed37e842fb46c
parent77ca973d119d999946e62553b88425cfcdc0de6a (diff)
downloadnginx-4a3884ae56cae78db8746ed7fbdce97554ee368f.tar.gz
nginx-4a3884ae56cae78db8746ed7fbdce97554ee368f.zip
Incorrect special case for "return 204" removed.
The special case in question leads to replies without body in configuration like location / { error_page 404 /zero; return 404; } location /zero { return 204; } while replies with empty body are expected per protocol specs. Correct one will look like if (status == NGX_HTTP_NO_CONTENT) { rc = ngx_http_send_header(r); if (rc == NGX_ERROR || r->header_only) { return rc; } return ngx_http_send_special(r, NGX_HTTP_LAST); } though it looks like it's better to drop this special case at all.
-rw-r--r--src/http/ngx_http_core_module.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index ae9d8479d..3056e8470 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1790,11 +1790,6 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
r->headers_out.status = status;
- if (status == NGX_HTTP_NO_CONTENT) {
- r->header_only = 1;
- return ngx_http_send_header(r);
- }
-
if (ngx_http_complex_value(r, cv, &val) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}