IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-20 14:13:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Request body: properly handle events while discarding body.

Browse Source 
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.
This commit is contained in:
Maxim Dounin 2012-11-21 00:57:56 +00:00
parent e1bd52041b
commit c29837fc4d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/http/ngx_http_request_body.c
View File

@ -482,19 +482,21 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
} }
} }
if (ngx_http_read_discarded_request_body(r) == NGX_OK) {
r->lingering_close = 0;
return NGX_OK;
}
/* == NGX_AGAIN */
r->read_event_handler = ngx_http_discarded_request_body_handler; r->read_event_handler = ngx_http_discarded_request_body_handler;
if (ngx_handle_read_event(rev, 0) != NGX_OK) { if (ngx_handle_read_event(rev, 0) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
if (ngx_http_read_discarded_request_body(r) == NGX_OK) { r->count++;
r->lingering_close = 0; r->discard_body = 1;
} else {
r->count++;
r->discard_body = 1;
}
return NGX_OK; return NGX_OK;
} }