mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-11 12:22:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP/2: reworked body reading to better match HTTP/1.x code.

Browse Source 
In particular, now the code always uses a buffer limited by
client_body_buffer_size.  At the cost of an additional copy it
ensures that small DATA frames are not directly mapped to small
write() syscalls, but rather buffered in memory before writing.
Further, requests without Content-Length are no longer forced
to use temporary files.
This commit is contained in:
Maxim Dounin 2021-08-29 22:20:36 +03:00
parent 301efb8a73
commit 78d9a3af91
1 changed files with 101 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
src/http/v2/ngx_http_v2.c
View File

@ -4032,11 +4032,11 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r)
len = r->headers_in.content_length_n;
if (r->request_body_no_buffering && !stream->in_closed) {
if (len < 0 || len > (off_t) clcf->client_body_buffer_size) {
len = clcf->client_body_buffer_size;
}
if (len < 0 || len > (off_t) clcf->client_body_buffer_size) {
len = clcf->client_body_buffer_size;
}
if (r->request_body_no_buffering && !stream->in_closed) {
/*
* We need a room to store data up to the stream's initial window size,
@ -4050,22 +4050,10 @@ ngx_http_v2_read_request_body(ngx_http_request_t *r)
if (len > NGX_HTTP_V2_MAX_WINDOW) {
len = NGX_HTTP_V2_MAX_WINDOW;
}
rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
} else if (len >= 0 && len <= (off_t) clcf->client_body_buffer_size
&& !r->request_body_in_file_only)
{
rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
} else {
rb->buf = ngx_calloc_buf(r->pool);
if (rb->buf != NULL) {
rb->buf->sync = 1;
}
}
rb->buf = ngx_create_temp_buf(r->pool, (size_t) len);
if (rb->buf == NULL) {
stream->skip_data = 1;
return NGX_HTTP_INTERNAL_SERVER_ERROR;
@ -4144,7 +4132,7 @@ static ngx_int_t
ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
size_t size, ngx_uint_t last)
{
ngx_buf_t *buf;
size_t n;
ngx_int_t rc;
ngx_connection_t *fc;
ngx_http_request_body_t *rb;
@ -4152,80 +4140,126 @@ ngx_http_v2_process_request_body(ngx_http_request_t *r, u_char *pos,
fc = r->connection;
rb = r->request_body;
buf = rb->buf;
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
"http2 process request body");
if (size) {
if (buf->sync) {
buf->pos = buf->start = pos;
buf->last = buf->end = pos + size;
if (size == 0 && !last) {
return NGX_OK;
}
r->request_body_in_file_only = 1;
for ( ;; ) {
for ( ;; ) {
if (rb->buf->last == rb->buf->end && size) {
} else {
if (size > (size_t) (buf->end - buf->last)) {
ngx_log_error(NGX_LOG_INFO, fc->log, 0,
"client intended to send body data "
"larger than declared");
if (r->request_body_no_buffering) {
return NGX_HTTP_BAD_REQUEST;
/* should never happen due to flow control */
ngx_log_error(NGX_LOG_ALERT, fc->log, 0,
"no space in http2 body buffer");
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
/* update chains */
ngx_log_error(NGX_LOG_DEBUG, fc->log, 0,
"http2 body update chains");
rc = ngx_http_v2_filter_request_body(r);
if (rc != NGX_OK) {
return rc;
}
if (rb->busy != NULL) {
ngx_log_error(NGX_LOG_ALERT, fc->log, 0,
"busy buffers after request body flush");
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
rb->buf->pos = rb->buf->start;
rb->buf->last = rb->buf->start;
}
buf->last = ngx_cpymem(buf->last, pos, size);
}
}
/* copy body data to the buffer */
if (last) {
rb->rest = 0;
n = rb->buf->end - rb->buf->last;
if (fc->read->timer_set) {
ngx_del_timer(fc->read);
if (n > size) {
n = size;
}
rb->buf->last = ngx_cpymem(rb->buf->last, pos, n);
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
"http2 request body recv %uz", n);
pos += n;
size -= n;
if (size == 0 && last) {
rb->rest = 0;
}
if (r->request_body_no_buffering) {
break;
}
/* pass buffer to request body filter chain */
rc = ngx_http_v2_filter_request_body(r);
if (rc != NGX_OK) {
return rc;
}
if (rb->rest == 0) {
break;
}
if (size == 0) {
break;
}
}
if (r->request_body_no_buffering) {
ngx_post_event(fc->read, &ngx_posted_events);
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
"http2 request body rest %O", rb->rest);
if (rb->rest == 0) {
break;
}
if (size == 0) {
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
ngx_add_timer(fc->read, clcf->client_body_timeout);
if (r->request_body_no_buffering) {
ngx_post_event(fc->read, &ngx_posted_events);
return NGX_OK;
}
return NGX_OK;
}
rc = ngx_http_v2_filter_request_body(r);
if (rc != NGX_OK) {
return rc;
}
if (buf->sync) {
/* prevent reusing this buffer in the upstream module */
rb->buf = NULL;
}
if (r->headers_in.chunked) {
r->headers_in.content_length_n = rb->received;
}
r->read_event_handler = ngx_http_block_reading;
rb->post_handler(r);
return NGX_OK;
}
if (size == 0) {
return NGX_OK;
if (fc->read->timer_set) {
ngx_del_timer(fc->read);
}
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
ngx_add_timer(fc->read, clcf->client_body_timeout);
if (r->request_body_no_buffering) {
ngx_post_event(fc->read, &ngx_posted_events);
return NGX_OK;
}
if (buf->sync) {
return ngx_http_v2_filter_request_body(r);
if (r->headers_in.chunked) {
r->headers_in.content_length_n = rb->received;
}
r->read_event_handler = ngx_http_block_reading;
rb->post_handler(r);
return NGX_OK;
}