mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-01 19:36:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge r3163, r3213:

Browse Source 
*) fix discarding body
*) prevent handling discarded body as a pipelined request
This commit is contained in:
Igor Sysoev 2010-02-01 14:42:38 +00:00
parent 7a03f30dd2
commit ce7f11c6d0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/http/ngx_http_request_body.c
View File

@ -458,6 +458,7 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
if (size) { if (size) {
if (r->headers_in.content_length_n > size) { if (r->headers_in.content_length_n > size) {
r->header_in->pos += size;
r->headers_in.content_length_n -= size; r->headers_in.content_length_n -= size;
} else { } else {
@ -559,12 +560,16 @@ ngx_http_read_discarded_request_body(ngx_http_request_t *r)
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http read discarded body"); "http read discarded body");
do { for ( ;; ) {
if (r->headers_in.content_length_n == 0) { if (r->headers_in.content_length_n == 0) {
r->read_event_handler = ngx_http_block_reading; r->read_event_handler = ngx_http_block_reading;
return NGX_OK; return NGX_OK;
} }
if (!r->connection->read->ready) {
return NGX_AGAIN;
}
size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ? size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
NGX_HTTP_DISCARD_BUFFER_SIZE: NGX_HTTP_DISCARD_BUFFER_SIZE:
(size_t) r->headers_in.content_length_n; (size_t) r->headers_in.content_length_n;
@ -585,10 +590,7 @@ ngx_http_read_discarded_request_body(ngx_http_request_t *r)
} }
r->headers_in.content_length_n -= n; r->headers_in.content_length_n -= n;
}
} while (r->connection->read->ready);
return NGX_AGAIN;
} }