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

Incorrect special case for "return 204" removed.

Browse source 
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.
This commit is contained in:
Maxim Dounin 2011-09-27 11:14:02 +00:00
parent 7a5a17bc76
commit 11129a676b
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/http/ngx_http_core_module.c
View file

@ -1790,11 +1790,6 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,
r->headers_out.status = 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) { if (ngx_http_complex_value(r, cv, &val) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }