Mercurial > hg > nginx
comparison src/http/ngx_http_header_filter_module.c @ 4957:7556a7acb14f stable-1.2
Merge of r4921, r4922, r4923, r4924, r4925: request body fixes.
*) Request body: fixed "501 Not Implemented" error handling.
It is not about "Method" but a generic message, and is expected to be used
e.g. if specified Transfer-Encoding is not supported. Fixed message to
match RFC 2616.
Additionally, disable keepalive on such errors as we won't be able to read
request body correctly if we don't understand Transfer-Encoding used.
*) Request body: $request_body variable generalization.
The $request_body variable was assuming there can't be more than two
buffers. While this is currently true due to request body reading
implementation details, this is not a good thing to depend on and may
change in the future.
*) Request body: code duplication reduced, no functional changes.
The r->request_body_in_file_only with empty body case is now handled in
ngx_http_write_request_body().
*) Request body: fixed socket leak on errors.
The r->main->count reference counter was always incremented in
ngx_http_read_client_request_body(), while it is only needs to be
incremented on positive returns.
*) Request body: properly handle events while discarding body.
An attempt to call ngx_handle_read_event() before actually reading
data from a socket might result in read event being disabled, which is
wrong. Catched by body.t test on Solaris.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 11 Dec 2012 13:18:50 +0000 |
parents | 47936d1c98e9 |
children | 7fa7e60a7f66 |
comparison
equal
deleted
inserted
replaced
4956:bbcaeccbd928 | 4957:7556a7acb14f |
---|---|
110 | 110 |
111 #define NGX_HTTP_LAST_4XX 417 | 111 #define NGX_HTTP_LAST_4XX 417 |
112 #define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX) | 112 #define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX) |
113 | 113 |
114 ngx_string("500 Internal Server Error"), | 114 ngx_string("500 Internal Server Error"), |
115 ngx_string("501 Method Not Implemented"), | 115 ngx_string("501 Not Implemented"), |
116 ngx_string("502 Bad Gateway"), | 116 ngx_string("502 Bad Gateway"), |
117 ngx_string("503 Service Temporarily Unavailable"), | 117 ngx_string("503 Service Temporarily Unavailable"), |
118 ngx_string("504 Gateway Time-out"), | 118 ngx_string("504 Gateway Time-out"), |
119 | 119 |
120 ngx_null_string, /* "505 HTTP Version Not Supported" */ | 120 ngx_null_string, /* "505 HTTP Version Not Supported" */ |