Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 4149:28b77af3a238
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.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Tue, 27 Sep 2011 11:14:02 +0000 |
| parents | 18f1cb12c6d7 |
| children | d434191a147f |
comparison
equal
deleted
inserted
replaced
| 4148:18f1cb12c6d7 | 4149:28b77af3a238 |
|---|---|
| 1787 if (ngx_http_discard_request_body(r) != NGX_OK) { | 1787 if (ngx_http_discard_request_body(r) != NGX_OK) { |
| 1788 return NGX_HTTP_INTERNAL_SERVER_ERROR; | 1788 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
| 1789 } | 1789 } |
| 1790 | 1790 |
| 1791 r->headers_out.status = status; | 1791 r->headers_out.status = status; |
| 1792 | |
| 1793 if (status == NGX_HTTP_NO_CONTENT) { | |
| 1794 r->header_only = 1; | |
| 1795 return ngx_http_send_header(r); | |
| 1796 } | |
| 1797 | 1792 |
| 1798 if (ngx_http_complex_value(r, cv, &val) != NGX_OK) { | 1793 if (ngx_http_complex_value(r, cv, &val) != NGX_OK) { |
| 1799 return NGX_HTTP_INTERNAL_SERVER_ERROR; | 1794 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
| 1800 } | 1795 } |
| 1801 | 1796 |