mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Request body: moved handling of the last part in the save filter.

Browse Source 
No functional changes.
This commit is contained in:
Valentin Bartenev 2016-03-01 15:18:07 +03:00
parent 89b8f57768
commit bc6fcb672c
1 changed files with 40 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/http/ngx_http_request_body.c
View File

@ -34,7 +34,7 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
ssize_t size; ssize_t size;
ngx_int_t rc; ngx_int_t rc;
ngx_buf_t *b; ngx_buf_t *b;
ngx_chain_t out, *cl; ngx_chain_t out;
ngx_http_request_body_t *rb; ngx_http_request_body_t *rb;
ngx_http_core_loc_conf_t *clcf; ngx_http_core_loc_conf_t *clcf;
@ -59,10 +59,6 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
goto done; goto done;
} }
if (r->request_body_no_buffering) {
r->request_body_in_file_only = 0;
}
rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t)); rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
if (rb == NULL) { if (rb == NULL) {
rc = NGX_HTTP_INTERNAL_SERVER_ERROR; rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
@ -148,37 +144,8 @@ ngx_http_read_client_request_body(ngx_http_request_t *r,
if (rb->rest == 0) { if (rb->rest == 0) {
/* the whole request body was pre-read */ /* the whole request body was pre-read */
if (r->request_body_in_file_only) {
if (ngx_http_write_request_body(r) != NGX_OK) {
rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
goto done;
}
if (rb->temp_file->file.offset != 0) {
cl = ngx_chain_get_free_buf(r->pool, &rb->free);
if (cl == NULL) {
rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
goto done;
}
b = cl->buf;
ngx_memzero(b, sizeof(ngx_buf_t));
b->in_file = 1;
b->file_last = rb->temp_file->file.offset;
b->file = &rb->temp_file->file;
rb->bufs = cl;
}
}
r->request_body_no_buffering = 0; r->request_body_no_buffering = 0;
post_handler(r); post_handler(r);
return NGX_OK; return NGX_OK;
} }
@ -289,8 +256,7 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
size_t size; size_t size;
ssize_t n; ssize_t n;
ngx_int_t rc; ngx_int_t rc;
ngx_buf_t *b; ngx_chain_t out;
ngx_chain_t *cl, out;
ngx_connection_t *c; ngx_connection_t *c;
ngx_http_request_body_t *rb; ngx_http_request_body_t *rb;
ngx_http_core_loc_conf_t *clcf; ngx_http_core_loc_conf_t *clcf;
@ -439,33 +405,6 @@ ngx_http_do_read_client_request_body(ngx_http_request_t *r)
ngx_del_timer(c->read); ngx_del_timer(c->read);
} }
if (rb->temp_file || r->request_body_in_file_only) {
/* save the last part */
if (ngx_http_write_request_body(r) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
if (rb->temp_file->file.offset != 0) {
cl = ngx_chain_get_free_buf(r->pool, &rb->free);
if (cl == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
b = cl->buf;
ngx_memzero(b, sizeof(ngx_buf_t));
b->in_file = 1;
b->file_last = rb->temp_file->file.offset;
b->file = &rb->temp_file->file;
rb->bufs = cl;
}
}
if (!r->request_body_no_buffering) { if (!r->request_body_no_buffering) {
r->read_event_handler = ngx_http_block_reading; r->read_event_handler = ngx_http_block_reading;
rb->post_handler(r); rb->post_handler(r);
@ -1127,9 +1066,8 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
ngx_int_t ngx_int_t
ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in) ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
{ {
#if (NGX_DEBUG) ngx_buf_t *b;
ngx_chain_t *cl; ngx_chain_t *cl;
#endif
ngx_http_request_body_t *rb; ngx_http_request_body_t *rb;
rb = r->request_body; rb = r->request_body;
@ -1166,13 +1104,46 @@ ngx_http_request_body_save_filter(ngx_http_request_t *r, ngx_chain_t *in)
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
if (rb->rest > 0 if (r->request_body_no_buffering) {
&& rb->buf && rb->buf->last == rb->buf->end return NGX_OK;
&& !r->request_body_no_buffering) }
{
if (rb->rest > 0) {
if (rb->buf && rb->buf->last == rb->buf->end
&& ngx_http_write_request_body(r) != NGX_OK)
{
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
return NGX_OK;
}
/* rb->rest == 0 */
if (rb->temp_file || r->request_body_in_file_only) {
if (ngx_http_write_request_body(r) != NGX_OK) { if (ngx_http_write_request_body(r) != NGX_OK) {
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
if (rb->temp_file->file.offset != 0) {
cl = ngx_chain_get_free_buf(r->pool, &rb->free);
if (cl == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
b = cl->buf;
ngx_memzero(b, sizeof(ngx_buf_t));
b->in_file = 1;
b->file_last = rb->temp_file->file.offset;
b->file = &rb->temp_file->file;
rb->bufs = cl;
}
} }
return NGX_OK; return NGX_OK;