nginx-quic: src/http/ngx_http_request

annotate src/http/ngx_http_request_body.c @ 8240:43f3574b3e6f quic

QUIC: fixed handling of clients connected to wildcard address. The patch replaces c->send() occurences with c->send_chain(), because the latter accounts for the local address, which may be different if the wildcard listener is used. Previously, server sent response to client using address different from one client connected to.

author	Vladimir Homutov <vl@nginx.com>
date	Mon, 07 Dec 2020 14:06:00 +0300
parents	507da0d3b070
children	6bd8ed493b85

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 396 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 396 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4072 diff changeset	4 * Copyright (C) Nginx, Inc.
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 396 diff changeset	5 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 396 diff changeset	6
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 82 diff changeset	8 #include <ngx_config.h>
a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 82 diff changeset	9 #include <ngx_core.h>
a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 82 diff changeset	10 #include <ngx_http.h>
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	13 static void ngx_http_read_client_request_body_handler(ngx_http_request_t *r);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	14 static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r);
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	15 static ngx_int_t ngx_http_copy_pipelined_header(ngx_http_request_t *r,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	16 ngx_buf_t *buf);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	17 static ngx_int_t ngx_http_write_request_body(ngx_http_request_t *r);
1370 cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	18 static ngx_int_t ngx_http_read_discarded_request_body(ngx_http_request_t *r);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	19 static ngx_int_t ngx_http_discard_request_body_filter(ngx_http_request_t *r,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	20 ngx_buf_t *b);
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	21 static ngx_int_t ngx_http_test_expect(ngx_http_request_t *r);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	22
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	23 static ngx_int_t ngx_http_request_body_filter(ngx_http_request_t *r,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	24 ngx_chain_t *in);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	25 static ngx_int_t ngx_http_request_body_length_filter(ngx_http_request_t *r,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	26 ngx_chain_t *in);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	27 static ngx_int_t ngx_http_request_body_chunked_filter(ngx_http_request_t *r,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	28 ngx_chain_t *in);
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	29
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 82 diff changeset	30
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	31 ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	32 ngx_http_read_client_request_body(ngx_http_request_t *r,
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	33 ngx_http_client_body_handler_pt post_handler)
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	34 {
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	35 size_t preread;
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	36 ssize_t size;
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	37 ngx_int_t rc;
5025 43cb2c9799c1 Request body: fixed client_body_in_file_only. Maxim Dounin <mdounin@mdounin.ru> parents: 4937 diff changeset	38 ngx_buf_t *b;
6420 3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	39 ngx_chain_t out;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	40 ngx_http_request_body_t *rb;
303 00c5660d2707 nginx-0.0.3-2004-04-01-20:20:53 import Igor Sysoev <igor@sysoev.ru> parents: 299 diff changeset	41 ngx_http_core_loc_conf_t *clcf;
297 ee394e997c77 nginx-0.0.3-2004-03-29-21:43:58 import Igor Sysoev <igor@sysoev.ru> parents: 296 diff changeset	42
3049 67254117b774 request reference counter Igor Sysoev <igor@sysoev.ru> parents: 2436 diff changeset	43 r->main->count++;
67254117b774 request reference counter Igor Sysoev <igor@sysoev.ru> parents: 2436 diff changeset	44
6496 887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	45 if (r != r->main \|\| r->request_body \|\| r->discard_body) {
887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	46 r->request_body_no_buffering = 0;
887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	47 post_handler(r);
887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	48 return NGX_OK;
887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	49 }
887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	50
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	51 if (ngx_http_test_expect(r) != NGX_OK) {
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	52 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	53 goto done;
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	54 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	55
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	56 rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	57 if (rb == NULL) {
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	58 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	59 goto done;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	60 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	61
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	62 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	63 * set by ngx_pcalloc():
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	64 *
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	65 * rb->bufs = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	66 * rb->buf = NULL;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	67 * rb->free = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	68 * rb->busy = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	69 * rb->chunked = NULL;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	70 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	71
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	72 rb->rest = -1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	73 rb->post_handler = post_handler;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	74
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	75 r->request_body = rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	76
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	77 if (r->headers_in.content_length_n < 0 && !r->headers_in.chunked) {
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	78 r->request_body_no_buffering = 0;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	79 post_handler(r);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	80 return NGX_OK;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	81 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	82
6989 2c4dbcd6f2e4 HTTP/2: reduced difference to HTTP/1.x in reading request body. Valentin Bartenev <vbart@nginx.com> parents: 6904 diff changeset	83 #if (NGX_HTTP_V2)
2c4dbcd6f2e4 HTTP/2: reduced difference to HTTP/1.x in reading request body. Valentin Bartenev <vbart@nginx.com> parents: 6904 diff changeset	84 if (r->stream) {
2c4dbcd6f2e4 HTTP/2: reduced difference to HTTP/1.x in reading request body. Valentin Bartenev <vbart@nginx.com> parents: 6904 diff changeset	85 rc = ngx_http_v2_read_request_body(r);
2c4dbcd6f2e4 HTTP/2: reduced difference to HTTP/1.x in reading request body. Valentin Bartenev <vbart@nginx.com> parents: 6904 diff changeset	86 goto done;
2c4dbcd6f2e4 HTTP/2: reduced difference to HTTP/1.x in reading request body. Valentin Bartenev <vbart@nginx.com> parents: 6904 diff changeset	87 }
2c4dbcd6f2e4 HTTP/2: reduced difference to HTTP/1.x in reading request body. Valentin Bartenev <vbart@nginx.com> parents: 6904 diff changeset	88 #endif
2c4dbcd6f2e4 HTTP/2: reduced difference to HTTP/1.x in reading request body. Valentin Bartenev <vbart@nginx.com> parents: 6904 diff changeset	89
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	90 preread = r->header_in->last - r->header_in->pos;
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 82 diff changeset	91
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	92 if (preread) {
296 bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	93
bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	94 /* there is the pre-read part of the request body */
bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	95
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	96 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	97 "http client request body preread %uz", preread);
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	98
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	99 out.buf = r->header_in;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	100 out.next = NULL;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	101
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	102 rc = ngx_http_request_body_filter(r, &out);
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	103
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	104 if (rc != NGX_OK) {
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	105 goto done;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	106 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	107
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	108 r->request_length += preread - (r->header_in->last - r->header_in->pos);
299 46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	109
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	110 if (!r->headers_in.chunked
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	111 && rb->rest > 0
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	112 && rb->rest <= (off_t) (r->header_in->end - r->header_in->last))
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	113 {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	114 /* the whole request body may be placed in r->header_in */
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	115
5111 57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	116 b = ngx_calloc_buf(r->pool);
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	117 if (b == NULL) {
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	118 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	119 goto done;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	120 }
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	121
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	122 b->temporary = 1;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	123 b->start = r->header_in->pos;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	124 b->pos = r->header_in->pos;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	125 b->last = r->header_in->last;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	126 b->end = r->header_in->end;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	127
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	128 rb->buf = b;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	129
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	130 r->read_event_handler = ngx_http_read_client_request_body_handler;
4937 3b6594a2b79f Request body: block write events while reading body. Maxim Dounin <mdounin@mdounin.ru> parents: 4936 diff changeset	131 r->write_event_handler = ngx_http_request_empty_handler;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	132
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	133 rc = ngx_http_do_read_client_request_body(r);
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	134 goto done;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	135 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	136
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	137 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	138 /* set rb->rest */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	139
8222 967cfa6e2ff8 Request body: removed error assumption (ticket #2058). Maxim Dounin <mdounin@mdounin.ru> parents: 8221 diff changeset	140 rc = ngx_http_request_body_filter(r, NULL);
967cfa6e2ff8 Request body: removed error assumption (ticket #2058). Maxim Dounin <mdounin@mdounin.ru> parents: 8221 diff changeset	141
967cfa6e2ff8 Request body: removed error assumption (ticket #2058). Maxim Dounin <mdounin@mdounin.ru> parents: 8221 diff changeset	142 if (rc != NGX_OK) {
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	143 goto done;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	144 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	145 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	146
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	147 if (rb->rest == 0) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	148 /* the whole request body was pre-read */
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	149 r->request_body_no_buffering = 0;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	150 post_handler(r);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	151 return NGX_OK;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	152 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	153
4936 240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	154 if (rb->rest < 0) {
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	155 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	156 "negative request body rest");
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	157 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	158 goto done;
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	159 }
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	160
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	161 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	162
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	163 size = clcf->client_body_buffer_size;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	164 size += size >> 2;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	165
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	166 /* TODO: honor r->request_body_in_single_buf */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	167
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	168 if (!r->headers_in.chunked && rb->rest < size) {
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	169 size = (ssize_t) rb->rest;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	170
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	171 if (r->request_body_in_single_buf) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	172 size += preread;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	173 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	174
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	175 } else {
303 00c5660d2707 nginx-0.0.3-2004-04-01-20:20:53 import Igor Sysoev <igor@sysoev.ru> parents: 299 diff changeset	176 size = clcf->client_body_buffer_size;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	177 }
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	178
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	179 rb->buf = ngx_create_temp_buf(r->pool, size);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	180 if (rb->buf == NULL) {
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	181 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	182 goto done;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	183 }
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	184
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	185 r->read_event_handler = ngx_http_read_client_request_body_handler;
4937 3b6594a2b79f Request body: block write events while reading body. Maxim Dounin <mdounin@mdounin.ru> parents: 4936 diff changeset	186 r->write_event_handler = ngx_http_request_empty_handler;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	187
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	188 rc = ngx_http_do_read_client_request_body(r);
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	189
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	190 done:
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	191
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	192 if (r->request_body_no_buffering
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	193 && (rc == NGX_OK \|\| rc == NGX_AGAIN))
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	194 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	195 if (rc == NGX_OK) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	196 r->request_body_no_buffering = 0;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	197
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	198 } else {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	199 /* rc == NGX_AGAIN */
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	200 r->reading_body = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	201 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	202
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	203 r->read_event_handler = ngx_http_block_reading;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	204 post_handler(r);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	205 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	206
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	207 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	208 r->main->count--;
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	209 }
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	210
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	211 return rc;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	212 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	213
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	214
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	215 ngx_int_t
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	216 ngx_http_read_unbuffered_request_body(ngx_http_request_t *r)
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	217 {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	218 ngx_int_t rc;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	219
6497 9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	220 #if (NGX_HTTP_V2)
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	221 if (r->stream) {
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	222 rc = ngx_http_v2_read_unbuffered_request_body(r);
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	223
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	224 if (rc == NGX_OK) {
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	225 r->reading_body = 0;
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	226 }
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	227
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	228 return rc;
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	229 }
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	230 #endif
9d66d7ed2abb HTTP/2: support for unbuffered upload of request body. Valentin Bartenev <vbart@nginx.com> parents: 6496 diff changeset	231
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	232 if (r->connection->read->timedout) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	233 r->connection->timedout = 1;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	234 return NGX_HTTP_REQUEST_TIME_OUT;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	235 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	236
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	237 rc = ngx_http_do_read_client_request_body(r);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	238
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	239 if (rc == NGX_OK) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	240 r->reading_body = 0;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	241 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	242
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	243 return rc;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	244 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	245
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	246
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	247 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	248 ngx_http_read_client_request_body_handler(ngx_http_request_t *r)
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	249 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	250 ngx_int_t rc;
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	251
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	252 if (r->connection->read->timedout) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	253 r->connection->timedout = 1;
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	254 ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
299 46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	255 return;
46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	256 }
46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	257
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	258 rc = ngx_http_do_read_client_request_body(r);
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	259
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	260 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	261 ngx_http_finalize_request(r, rc);
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	262 }
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	263 }
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	264
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	265
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	266 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	267 ngx_http_do_read_client_request_body(ngx_http_request_t *r)
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	268 {
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	269 off_t rest;
290 87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 171 diff changeset	270 size_t size;
87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 171 diff changeset	271 ssize_t n;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	272 ngx_int_t rc;
6420 3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	273 ngx_chain_t out;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	274 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	275 ngx_http_request_body_t *rb;
162 96993d4d5067 nginx-0.0.1-2003-10-28-00:01:00 import Igor Sysoev <igor@sysoev.ru> parents: 160 diff changeset	276 ngx_http_core_loc_conf_t *clcf;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	277
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	278 c = r->connection;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	279 rb = r->request_body;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	280
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	281 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	282 "http read client request body");
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	283
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	284 for ( ;; ) {
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	285 for ( ;; ) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	286 if (rb->buf->last == rb->buf->end) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	287
8036 08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	288 /* update chains */
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	289
8036 08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	290 rc = ngx_http_request_body_filter(r, NULL);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	291
8036 08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	292 if (rc != NGX_OK) {
08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	293 return rc;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	294 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	295
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	296 if (rb->busy != NULL) {
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	297 if (r->request_body_no_buffering) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	298 if (c->read->timer_set) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	299 ngx_del_timer(c->read);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	300 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	301
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	302 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	303 return NGX_HTTP_INTERNAL_SERVER_ERROR;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	304 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	305
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	306 return NGX_AGAIN;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	307 }
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	308
8221 4d5b04daeaff Request body: improved logging. Maxim Dounin <mdounin@mdounin.ru> parents: 8220 diff changeset	309 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
4d5b04daeaff Request body: improved logging. Maxim Dounin <mdounin@mdounin.ru> parents: 8220 diff changeset	310 "busy buffers after request body flush");
4d5b04daeaff Request body: improved logging. Maxim Dounin <mdounin@mdounin.ru> parents: 8220 diff changeset	311
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	312 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	313 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	314
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	315 rb->buf->pos = rb->buf->start;
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	316 rb->buf->last = rb->buf->start;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	317 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	318
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	319 size = rb->buf->end - rb->buf->last;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	320 rest = rb->rest - (rb->buf->last - rb->buf->pos);
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	321
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	322 if ((off_t) size > rest) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	323 size = (size_t) rest;
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	324 }
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	325
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	326 n = c->recv(c, rb->buf->last, size);
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	327
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	328 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	329 "http client request body recv %z", n);
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	330
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	331 if (n == NGX_AGAIN) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	332 break;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	333 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	334
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	335 if (n == 0) {
7761 5649079a41f4 Parsing HTTP/3 request body. Roman Arutyunyan <arut@nginx.com> parents: 6989 diff changeset	336 rb->buf->last_buf = 1;
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	337 }
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	338
7761 5649079a41f4 Parsing HTTP/3 request body. Roman Arutyunyan <arut@nginx.com> parents: 6989 diff changeset	339 if (n == NGX_ERROR) {
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	340 c->error = 1;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	341 return NGX_HTTP_BAD_REQUEST;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	342 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	343
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	344 rb->buf->last += n;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	345 r->request_length += n;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	346
8036 08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	347 /* pass buffer to request body filter chain */
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	348
8036 08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	349 out.buf = rb->buf;
08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	350 out.next = NULL;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	351
8036 08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	352 rc = ngx_http_request_body_filter(r, &out);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	353
8036 08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	354 if (rc != NGX_OK) {
08ff2e10ae92 Request body: all read data are now sent to filters. Maxim Dounin <mdounin@mdounin.ru> parents: 6989 diff changeset	355 return rc;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	356 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	357
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	358 if (rb->rest == 0) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	359 break;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	360 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	361
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	362 if (rb->buf->last < rb->buf->end) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	363 break;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	364 }
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	365 }
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	366
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	367 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
1112 3dcc3041b5bc fix format Igor Sysoev <igor@sysoev.ru> parents: 1075 diff changeset	368 "http client request body rest %O", rb->rest);
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	369
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	370 if (rb->rest == 0) {
294 5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 293 diff changeset	371 break;
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 293 diff changeset	372 }
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 293 diff changeset	373
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	374 if (!c->read->ready) {
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	375
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	376 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	377 ngx_add_timer(c->read, clcf->client_body_timeout);
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	378
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	379 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	380 return NGX_HTTP_INTERNAL_SERVER_ERROR;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	381 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	382
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	383 return NGX_AGAIN;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	384 }
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	385 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	386
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	387 if (ngx_http_copy_pipelined_header(r, rb->buf) != NGX_OK) {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	388 return NGX_HTTP_INTERNAL_SERVER_ERROR;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	389 }
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	390
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	391 if (c->read->timer_set) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	392 ngx_del_timer(c->read);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	393 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	394
6050 a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	395 if (!r->request_body_no_buffering) {
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	396 r->read_event_handler = ngx_http_block_reading;
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	397 rb->post_handler(r);
a08fad30aeac Request body: unbuffered reading. Maxim Dounin <mdounin@mdounin.ru> parents: 6049 diff changeset	398 }
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	399
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	400 return NGX_OK;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	401 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	402
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	403
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	404 static ngx_int_t
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	405 ngx_http_copy_pipelined_header(ngx_http_request_t r, ngx_buf_t buf)
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	406 {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	407 size_t n;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	408 ngx_buf_t *b;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	409 ngx_chain_t *cl;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	410 ngx_http_connection_t *hc;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	411 ngx_http_core_srv_conf_t *cscf;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	412
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	413 b = r->header_in;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	414 n = buf->last - buf->pos;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	415
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	416 if (buf == b \|\| n == 0) {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	417 return NGX_OK;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	418 }
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	419
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	420 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	421 "http body pipelined header: %uz", n);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	422
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	423 /*
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	424 * if there is a pipelined request in the client body buffer,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	425 * copy it to the r->header_in buffer if there is enough room,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	426 * or allocate a large client header buffer
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	427 */
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	428
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	429 if (n > (size_t) (b->end - b->last)) {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	430
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	431 hc = r->http_connection;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	432
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	433 if (hc->free) {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	434 cl = hc->free;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	435 hc->free = cl->next;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	436
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	437 b = cl->buf;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	438
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	439 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	440 "http large header free: %p %uz",
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	441 b->pos, b->end - b->last);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	442
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	443 } else {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	444 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	445
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	446 b = ngx_create_temp_buf(r->connection->pool,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	447 cscf->large_client_header_buffers.size);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	448 if (b == NULL) {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	449 return NGX_ERROR;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	450 }
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	451
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	452 cl = ngx_alloc_chain_link(r->connection->pool);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	453 if (cl == NULL) {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	454 return NGX_ERROR;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	455 }
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	456
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	457 cl->buf = b;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	458
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	459 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	460 "http large header alloc: %p %uz",
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	461 b->pos, b->end - b->last);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	462 }
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	463
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	464 cl->next = hc->busy;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	465 hc->busy = cl;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	466 hc->nbusy++;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	467
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	468 r->header_in = b;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	469
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	470 if (n > (size_t) (b->end - b->last)) {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	471 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	472 "too large pipelined header after reading body");
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	473 return NGX_ERROR;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	474 }
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	475 }
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	476
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	477 ngx_memcpy(b->last, buf->pos, n);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	478
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	479 b->last += n;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	480 r->request_length -= n;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	481
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	482 return NGX_OK;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	483 }
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	484
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	485
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	486 static ngx_int_t
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	487 ngx_http_write_request_body(ngx_http_request_t *r)
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	488 {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	489 ssize_t n;
6047 e2e609f59094 Request body: free chain links in ngx_http_write_request_body(). Maxim Dounin <mdounin@mdounin.ru> parents: 6044 diff changeset	490 ngx_chain_t cl, ln;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	491 ngx_temp_file_t *tf;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	492 ngx_http_request_body_t *rb;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	493 ngx_http_core_loc_conf_t *clcf;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	494
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	495 rb = r->request_body;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	496
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	497 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	498 "http write client request body, bufs %p", rb->bufs);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	499
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	500 if (rb->temp_file == NULL) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	501 tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	502 if (tf == NULL) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	503 return NGX_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	504 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	505
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	506 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	507
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	508 tf->file.fd = NGX_INVALID_FILE;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	509 tf->file.log = r->connection->log;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	510 tf->path = clcf->client_body_temp_path;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	511 tf->pool = r->pool;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	512 tf->warn = "a client request body is buffered to a temporary file";
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	513 tf->log_level = r->request_body_file_log_level;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	514 tf->persistent = r->request_body_in_persistent_file;
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	515 tf->clean = r->request_body_in_clean_file;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	516
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	517 if (r->request_body_file_group_access) {
1046 bb139aba3199 rename mode to access Igor Sysoev <igor@sysoev.ru> parents: 841 diff changeset	518 tf->access = 0660;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	519 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	520
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	521 rb->temp_file = tf;
4922 dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	522
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	523 if (rb->bufs == NULL) {
4922 dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	524 /* empty body with r->request_body_in_file_only */
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	525
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	526 if (ngx_create_temp_file(&tf->file, tf->path, tf->pool,
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	527 tf->persistent, tf->clean, tf->access)
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	528 != NGX_OK)
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	529 {
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	530 return NGX_ERROR;
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	531 }
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	532
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	533 return NGX_OK;
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	534 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	535 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	536
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	537 if (rb->bufs == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	538 return NGX_OK;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	539 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	540
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	541 n = ngx_write_chain_to_temp_file(rb->temp_file, rb->bufs);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	542
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	543 /* TODO: n == 0 or not complete and level event */
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	544
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	545 if (n == NGX_ERROR) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	546 return NGX_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	547 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	548
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	549 rb->temp_file->offset += n;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	550
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	551 /* mark all buffers as written */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	552
6047 e2e609f59094 Request body: free chain links in ngx_http_write_request_body(). Maxim Dounin <mdounin@mdounin.ru> parents: 6044 diff changeset	553 for (cl = rb->bufs; cl; /* void */) {
e2e609f59094 Request body: free chain links in ngx_http_write_request_body(). Maxim Dounin <mdounin@mdounin.ru> parents: 6044 diff changeset	554
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	555 cl->buf->pos = cl->buf->last;
6047 e2e609f59094 Request body: free chain links in ngx_http_write_request_body(). Maxim Dounin <mdounin@mdounin.ru> parents: 6044 diff changeset	556
e2e609f59094 Request body: free chain links in ngx_http_write_request_body(). Maxim Dounin <mdounin@mdounin.ru> parents: 6044 diff changeset	557 ln = cl;
e2e609f59094 Request body: free chain links in ngx_http_write_request_body(). Maxim Dounin <mdounin@mdounin.ru> parents: 6044 diff changeset	558 cl = cl->next;
e2e609f59094 Request body: free chain links in ngx_http_write_request_body(). Maxim Dounin <mdounin@mdounin.ru> parents: 6044 diff changeset	559 ngx_free_chain(r->pool, ln);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	560 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	561
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	562 rb->bufs = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	563
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	564 return NGX_OK;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	565 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	566
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	567
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	568 ngx_int_t
1370 cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	569 ngx_http_discard_request_body(ngx_http_request_t *r)
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	570 {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	571 ssize_t size;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	572 ngx_int_t rc;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	573 ngx_event_t *rev;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	574
6496 887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	575 if (r != r->main \|\| r->discard_body \|\| r->request_body) {
887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	576 return NGX_OK;
887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	577 }
887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	578
6246 257b51c37c5a The HTTP/2 implementation (RFC 7240, 7241). Valentin Bartenev <vbart@nginx.com> parents: 6067 diff changeset	579 #if (NGX_HTTP_V2)
6496 887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	580 if (r->stream) {
887cca40ba6a HTTP/2: rewritten handling of request body. Valentin Bartenev <vbart@nginx.com> parents: 6420 diff changeset	581 r->stream->skip_data = 1;
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	582 return NGX_OK;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	583 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	584 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	585
8067 eaea7dac3292 HTTP/3: drop the unwanted remainder of the request. Roman Arutyunyan <arut@nginx.com> parents: 8058 diff changeset	586 #if (NGX_HTTP_QUIC)
8200 279ad36f2f4b QUIC: renamed c->qs to c->quic. Roman Arutyunyan <arut@nginx.com> parents: 8089 diff changeset	587 if (r->connection->quic) {
8067 eaea7dac3292 HTTP/3: drop the unwanted remainder of the request. Roman Arutyunyan <arut@nginx.com> parents: 8058 diff changeset	588 return NGX_OK;
eaea7dac3292 HTTP/3: drop the unwanted remainder of the request. Roman Arutyunyan <arut@nginx.com> parents: 8058 diff changeset	589 }
eaea7dac3292 HTTP/3: drop the unwanted remainder of the request. Roman Arutyunyan <arut@nginx.com> parents: 8058 diff changeset	590 #endif
eaea7dac3292 HTTP/3: drop the unwanted remainder of the request. Roman Arutyunyan <arut@nginx.com> parents: 8058 diff changeset	591
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	592 if (ngx_http_test_expect(r) != NGX_OK) {
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	593 return NGX_HTTP_INTERNAL_SERVER_ERROR;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	594 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	595
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	596 rev = r->connection->read;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	597
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	598 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, "http set discard body");
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	599
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	600 if (rev->timer_set) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	601 ngx_del_timer(rev);
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	602 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	603
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	604 if (r->headers_in.content_length_n <= 0 && !r->headers_in.chunked) {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	605 return NGX_OK;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	606 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	607
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	608 size = r->header_in->last - r->header_in->pos;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	609
4934 b61edaa04342 Request body: fixed discard of chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4931 diff changeset	610 if (size \|\| r->headers_in.chunked) {
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	611 rc = ngx_http_discard_request_body_filter(r, r->header_in);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	612
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	613 if (rc != NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	614 return rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	615 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	616
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	617 if (r->headers_in.content_length_n == 0) {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	618 return NGX_OK;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	619 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	620 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	621
4935 7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	622 rc = ngx_http_read_discarded_request_body(r);
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	623
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	624 if (rc == NGX_OK) {
4924 caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	625 r->lingering_close = 0;
caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	626 return NGX_OK;
caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	627 }
caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	628
4935 7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	629 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	630 return rc;
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	631 }
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	632
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	633 /* rc == NGX_AGAIN */
4924 caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	634
3214 798a7f1d3b2f restore discard body handler after ngx_http_set_writer() set it to Igor Sysoev <igor@sysoev.ru> parents: 3213 diff changeset	635 r->read_event_handler = ngx_http_discarded_request_body_handler;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	636
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	637 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	638 return NGX_HTTP_INTERNAL_SERVER_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	639 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	640
4924 caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	641 r->count++;
caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	642 r->discard_body = 1;
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	643
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	644 return NGX_OK;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	645 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	646
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	647
3214 798a7f1d3b2f restore discard body handler after ngx_http_set_writer() set it to Igor Sysoev <igor@sysoev.ru> parents: 3213 diff changeset	648 void
798a7f1d3b2f restore discard body handler after ngx_http_set_writer() set it to Igor Sysoev <igor@sysoev.ru> parents: 3213 diff changeset	649 ngx_http_discarded_request_body_handler(ngx_http_request_t *r)
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	650 {
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	651 ngx_int_t rc;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	652 ngx_msec_t timer;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	653 ngx_event_t *rev;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	654 ngx_connection_t *c;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	655 ngx_http_core_loc_conf_t *clcf;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	656
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	657 c = r->connection;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	658 rev = c->read;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	659
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	660 if (rev->timedout) {
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	661 c->timedout = 1;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	662 c->error = 1;
3213 7fc06314c684 fix ngx_http_finalize_request() code after a body has been discarded Igor Sysoev <igor@sysoev.ru> parents: 3212 diff changeset	663 ngx_http_finalize_request(r, NGX_ERROR);
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	664 return;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	665 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	666
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	667 if (r->lingering_time) {
5210 ea2ba6dbe361 Fixed lingering_time check. Maxim Dounin <mdounin@mdounin.ru> parents: 5199 diff changeset	668 timer = (ngx_msec_t) r->lingering_time - (ngx_msec_t) ngx_time();
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	669
5210 ea2ba6dbe361 Fixed lingering_time check. Maxim Dounin <mdounin@mdounin.ru> parents: 5199 diff changeset	670 if ((ngx_msec_int_t) timer <= 0) {
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	671 r->discard_body = 0;
3181 36f6407817dc clear r->lingering_close to disable preventively calling Igor Sysoev <igor@sysoev.ru> parents: 3179 diff changeset	672 r->lingering_close = 0;
3213 7fc06314c684 fix ngx_http_finalize_request() code after a body has been discarded Igor Sysoev <igor@sysoev.ru> parents: 3212 diff changeset	673 ngx_http_finalize_request(r, NGX_ERROR);
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	674 return;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	675 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	676
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	677 } else {
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	678 timer = 0;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	679 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	680
1370 cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	681 rc = ngx_http_read_discarded_request_body(r);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	682
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	683 if (rc == NGX_OK) {
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	684 r->discard_body = 0;
3181 36f6407817dc clear r->lingering_close to disable preventively calling Igor Sysoev <igor@sysoev.ru> parents: 3179 diff changeset	685 r->lingering_close = 0;
8220 554c6ae25ffc SSL: fixed non-working SSL shutdown on lingering close. Ruslan Ermilov <ru@nginx.com> parents: 8038 diff changeset	686 r->lingering_time = 0;
3213 7fc06314c684 fix ngx_http_finalize_request() code after a body has been discarded Igor Sysoev <igor@sysoev.ru> parents: 3212 diff changeset	687 ngx_http_finalize_request(r, NGX_DONE);
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	688 return;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	689 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	690
4935 7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	691 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	692 c->error = 1;
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	693 ngx_http_finalize_request(r, NGX_ERROR);
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	694 return;
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	695 }
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	696
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	697 /* rc == NGX_AGAIN */
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	698
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	699 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
1456 698ea64f71e1 fix unlikely socket leak Igor Sysoev <igor@sysoev.ru> parents: 1455 diff changeset	700 c->error = 1;
3213 7fc06314c684 fix ngx_http_finalize_request() code after a body has been discarded Igor Sysoev <igor@sysoev.ru> parents: 3212 diff changeset	701 ngx_http_finalize_request(r, NGX_ERROR);
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	702 return;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	703 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	704
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	705 if (timer) {
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	706
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	707 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	708
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	709 timer *= 1000;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	710
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	711 if (timer > clcf->lingering_timeout) {
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	712 timer = clcf->lingering_timeout;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	713 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	714
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	715 ngx_add_timer(rev, timer);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	716 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	717 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	718
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	719
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	720 static ngx_int_t
1370 cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	721 ngx_http_read_discarded_request_body(ngx_http_request_t *r)
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	722 {
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	723 size_t size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	724 ssize_t n;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	725 ngx_int_t rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	726 ngx_buf_t b;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	727 u_char buffer[NGX_HTTP_DISCARD_BUFFER_SIZE];
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	728
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	729 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	730 "http read discarded body");
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	731
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	732 ngx_memzero(&b, sizeof(ngx_buf_t));
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	733
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	734 b.temporary = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	735
3162 9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	736 for ( ;; ) {
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	737 if (r->headers_in.content_length_n == 0) {
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	738 break;
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	739 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	740
3162 9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	741 if (!r->connection->read->ready) {
9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	742 return NGX_AGAIN;
9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	743 }
9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	744
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	745 size = (size_t) ngx_min(r->headers_in.content_length_n,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	746 NGX_HTTP_DISCARD_BUFFER_SIZE);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	747
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	748 n = r->connection->recv(r->connection, buffer, size);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	749
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	750 if (n == NGX_ERROR) {
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	751 r->connection->error = 1;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	752 return NGX_OK;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	753 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	754
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	755 if (n == NGX_AGAIN) {
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	756 return NGX_AGAIN;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	757 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	758
1422 65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	759 if (n == 0) {
65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	760 return NGX_OK;
65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	761 }
65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	762
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	763 b.pos = buffer;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	764 b.last = buffer + n;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	765
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	766 rc = ngx_http_discard_request_body_filter(r, &b);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	767
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	768 if (rc != NGX_OK) {
4935 7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	769 return rc;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	770 }
3162 9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	771 }
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	772
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	773 if (ngx_http_copy_pipelined_header(r, &b) != NGX_OK) {
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	774 return NGX_HTTP_INTERNAL_SERVER_ERROR;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	775 }
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	776
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	777 r->read_event_handler = ngx_http_block_reading;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	778
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	779 return NGX_OK;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	780 }
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	781
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	782
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	783 static ngx_int_t
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	784 ngx_http_discard_request_body_filter(ngx_http_request_t r, ngx_buf_t b)
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	785 {
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	786 size_t size;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	787 ngx_int_t rc;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	788 ngx_http_request_body_t *rb;
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	789 ngx_http_core_srv_conf_t *cscf;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	790
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	791 if (r->headers_in.chunked) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	792
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	793 rb = r->request_body;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	794
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	795 if (rb == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	796
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	797 rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	798 if (rb == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	799 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	800 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	801
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	802 rb->chunked = ngx_pcalloc(r->pool, sizeof(ngx_http_chunked_t));
4936 240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	803 if (rb->chunked == NULL) {
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	804 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	805 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	806
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	807 r->request_body = rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	808 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	809
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	810 for ( ;; ) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	811
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	812 rc = ngx_http_parse_chunked(r, b, rb->chunked);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	813
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	814 if (rc == NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	815
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	816 /* a chunk has been parsed successfully */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	817
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	818 size = b->last - b->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	819
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	820 if ((off_t) size > rb->chunked->size) {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5210 diff changeset	821 b->pos += (size_t) rb->chunked->size;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	822 rb->chunked->size = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	823
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	824 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	825 rb->chunked->size -= size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	826 b->pos = b->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	827 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	828
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	829 continue;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	830 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	831
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	832 if (rc == NGX_DONE) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	833
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	834 /* a whole response has been parsed successfully */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	835
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	836 r->headers_in.content_length_n = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	837 break;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	838 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	839
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	840 if (rc == NGX_AGAIN) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	841
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	842 /* set amount of data we want to see next time */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	843
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	844 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	845
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	846 r->headers_in.content_length_n = ngx_max(rb->chunked->length,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	847 (off_t) cscf->large_client_header_buffers.size);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	848 break;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	849 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	850
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	851 /* invalid */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	852
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	853 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	854 "client sent invalid chunked body");
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	855
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	856 return NGX_HTTP_BAD_REQUEST;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	857 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	858
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	859 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	860 size = b->last - b->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	861
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	862 if ((off_t) size > r->headers_in.content_length_n) {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5210 diff changeset	863 b->pos += (size_t) r->headers_in.content_length_n;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	864 r->headers_in.content_length_n = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	865
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	866 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	867 b->pos = b->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	868 r->headers_in.content_length_n -= size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	869 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	870 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	871
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	872 return NGX_OK;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	873 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	874
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	875
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	876 static ngx_int_t
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	877 ngx_http_test_expect(ngx_http_request_t *r)
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	878 {
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	879 ngx_int_t n;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	880 ngx_str_t *expect;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	881
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	882 if (r->expect_tested
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	883 \|\| r->headers_in.expect == NULL
7761 5649079a41f4 Parsing HTTP/3 request body. Roman Arutyunyan <arut@nginx.com> parents: 6989 diff changeset	884 \|\| r->http_version != NGX_HTTP_VERSION_11)
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	885 {
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	886 return NGX_OK;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	887 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	888
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	889 r->expect_tested = 1;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	890
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	891 expect = &r->headers_in.expect->value;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	892
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	893 if (expect->len != sizeof("100-continue") - 1
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	894 \|\| ngx_strncasecmp(expect->data, (u_char *) "100-continue",
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	895 sizeof("100-continue") - 1)
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	896 != 0)
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	897 {
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	898 return NGX_OK;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	899 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	900
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	901 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	902 "send 100 Continue");
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	903
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	904 n = r->connection->send(r->connection,
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	905 (u_char *) "HTTP/1.1 100 Continue" CRLF CRLF,
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	906 sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1);
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	907
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	908 if (n == sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1) {
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	909 return NGX_OK;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	910 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	911
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	912 /* we assume that such small packet should be send successfully */
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	913
6903 92e771de7d89 Request body: c->error on "100 Continue" errors (ticket #1194). Maxim Dounin <mdounin@mdounin.ru> parents: 6497 diff changeset	914 r->connection->error = 1;
92e771de7d89 Request body: c->error on "100 Continue" errors (ticket #1194). Maxim Dounin <mdounin@mdounin.ru> parents: 6497 diff changeset	915
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	916 return NGX_ERROR;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	917 }
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	918
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	919
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	920 static ngx_int_t
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	921 ngx_http_request_body_filter(ngx_http_request_t r, ngx_chain_t in)
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	922 {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	923 if (r->headers_in.chunked) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	924 return ngx_http_request_body_chunked_filter(r, in);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	925
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	926 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	927 return ngx_http_request_body_length_filter(r, in);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	928 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	929 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	930
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	931
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	932 static ngx_int_t
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	933 ngx_http_request_body_length_filter(ngx_http_request_t r, ngx_chain_t in)
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	934 {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	935 size_t size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	936 ngx_int_t rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	937 ngx_buf_t *b;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	938 ngx_chain_t cl, tl, out, *ll;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	939 ngx_http_request_body_t *rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	940
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	941 rb = r->request_body;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	942
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	943 if (rb->rest == -1) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	944 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	945 "http request body content length filter");
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	946
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	947 rb->rest = r->headers_in.content_length_n;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	948 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	949
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	950 out = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	951 ll = &out;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	952
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	953 for (cl = in; cl; cl = cl->next) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	954
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	955 if (rb->rest == 0) {
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	956 break;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	957 }
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	958
8086 9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	959 size = cl->buf->last - cl->buf->pos;
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	960
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	961 if (cl->buf->last_buf && (off_t) size < rb->rest) {
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	962 ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	963 "client prematurely closed connection");
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	964 r->connection->error = 1;
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	965 return NGX_HTTP_BAD_REQUEST;
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	966 }
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	967
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	968 tl = ngx_chain_get_free_buf(r->pool, &rb->free);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	969 if (tl == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	970 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	971 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	972
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	973 b = tl->buf;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	974
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	975 ngx_memzero(b, sizeof(ngx_buf_t));
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	976
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	977 b->temporary = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	978 b->tag = (ngx_buf_tag_t) &ngx_http_read_client_request_body;
5110 0bbdd966a383 Request body: next upstream fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5025 diff changeset	979 b->start = cl->buf->pos;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	980 b->pos = cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	981 b->last = cl->buf->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	982 b->end = cl->buf->end;
6067 231a5bbd9e9c Request body: always flush buffers if request buffering is off. Valentin Bartenev <vbart@nginx.com> parents: 6050 diff changeset	983 b->flush = r->request_body_no_buffering;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	984
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	985 if ((off_t) size < rb->rest) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	986 cl->buf->pos = cl->buf->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	987 rb->rest -= size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	988
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	989 } else {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5210 diff changeset	990 cl->buf->pos += (size_t) rb->rest;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	991 rb->rest = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	992 b->last = cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	993 b->last_buf = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	994 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	995
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	996 *ll = tl;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	997 ll = &tl->next;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	998 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	999
6049 42d9beeb22db Request body: filters support. Maxim Dounin <mdounin@mdounin.ru> parents: 6048 diff changeset	1000 rc = ngx_http_top_request_body_filter(r, out);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1001
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1002 ngx_chain_update_chains(r->pool, &rb->free, &rb->busy, &out,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1003 (ngx_buf_tag_t) &ngx_http_read_client_request_body);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1004
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1005 return rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1006 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1007
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1008
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1009 static ngx_int_t
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1010 ngx_http_request_body_chunked_filter(ngx_http_request_t r, ngx_chain_t in)
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1011 {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1012 size_t size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1013 ngx_int_t rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1014 ngx_buf_t *b;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1015 ngx_chain_t cl, out, tl, *ll;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1016 ngx_http_request_body_t *rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1017 ngx_http_core_loc_conf_t *clcf;
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	1018 ngx_http_core_srv_conf_t *cscf;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1019
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1020 rb = r->request_body;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1021
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1022 if (rb->rest == -1) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1023
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1024 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1025 "http request body chunked filter");
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1026
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1027 rb->chunked = ngx_pcalloc(r->pool, sizeof(ngx_http_chunked_t));
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1028 if (rb->chunked == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1029 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1030 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1031
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	1032 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	1033
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1034 r->headers_in.content_length_n = 0;
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	1035 rb->rest = cscf->large_client_header_buffers.size;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1036 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1037
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1038 out = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1039 ll = &out;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1040
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1041 for (cl = in; cl; cl = cl->next) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1042
8038 f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1043 b = NULL;
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1044
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1045 for ( ;; ) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1046
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1047 ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1048 "http body chunked buf "
6044 b8926ba4d087 Format specifier fixed for file size of buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 5588 diff changeset	1049 "t:%d f:%d %p, pos %p, size: %z file: %O, size: %O",
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1050 cl->buf->temporary, cl->buf->in_file,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1051 cl->buf->start, cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1052 cl->buf->last - cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1053 cl->buf->file_pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1054 cl->buf->file_last - cl->buf->file_pos);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1055
7881 e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1056 switch (r->http_version) {
e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1057 #if (NGX_HTTP_V3)
e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1058 case NGX_HTTP_VERSION_30:
e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1059 rc = ngx_http_v3_parse_request_body(r, cl->buf, rb->chunked);
e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1060 break;
e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1061 #endif
e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1062
e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1063 default: /* HTTP/1.x */
e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1064 rc = ngx_http_parse_chunked(r, cl->buf, rb->chunked);
e5d4f057a6cb HTTP/3: move body parser call out of ngx_http_parse_chunked(). Roman Arutyunyan <arut@nginx.com> parents: 7761 diff changeset	1065 }
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1066
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1067 if (rc == NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1068
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1069 /* a chunk has been parsed successfully */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1070
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1071 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1072
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1073 if (clcf->client_max_body_size
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1074 && clcf->client_max_body_size
5588 6fc3921025f0 Request body: avoid potential overflow. Maxim Dounin <mdounin@mdounin.ru> parents: 5502 diff changeset	1075 - r->headers_in.content_length_n < rb->chunked->size)
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1076 {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1077 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1078 "client intended to send too large chunked "
5588 6fc3921025f0 Request body: avoid potential overflow. Maxim Dounin <mdounin@mdounin.ru> parents: 5502 diff changeset	1079 "body: %O+%O bytes",
6fc3921025f0 Request body: avoid potential overflow. Maxim Dounin <mdounin@mdounin.ru> parents: 5502 diff changeset	1080 r->headers_in.content_length_n,
6fc3921025f0 Request body: avoid potential overflow. Maxim Dounin <mdounin@mdounin.ru> parents: 5502 diff changeset	1081 rb->chunked->size);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1082
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1083 r->lingering_close = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1084
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1085 return NGX_HTTP_REQUEST_ENTITY_TOO_LARGE;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1086 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1087
8038 f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1088 if (b
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1089 && rb->chunked->size <= 128
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1090 && cl->buf->last - cl->buf->pos >= rb->chunked->size)
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1091 {
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1092 r->headers_in.content_length_n += rb->chunked->size;
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1093
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1094 if (rb->chunked->size < 8) {
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1095
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1096 while (rb->chunked->size) {
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1097 b->last++ = cl->buf->pos++;
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1098 rb->chunked->size--;
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1099 }
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1100
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1101 } else {
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1102 ngx_memmove(b->last, cl->buf->pos, rb->chunked->size);
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1103 b->last += rb->chunked->size;
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1104 cl->buf->pos += rb->chunked->size;
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1105 rb->chunked->size = 0;
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1106 }
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1107
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1108 continue;
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1109 }
f5a2af0e7079 Request body: optimized handling of small chunks. Maxim Dounin <mdounin@mdounin.ru> parents: 8037 diff changeset	1110
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1111 tl = ngx_chain_get_free_buf(r->pool, &rb->free);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1112 if (tl == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1113 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1114 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1115
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1116 b = tl->buf;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1117
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1118 ngx_memzero(b, sizeof(ngx_buf_t));
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1119
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1120 b->temporary = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1121 b->tag = (ngx_buf_tag_t) &ngx_http_read_client_request_body;
5110 0bbdd966a383 Request body: next upstream fix. Maxim Dounin <mdounin@mdounin.ru> parents: 5025 diff changeset	1122 b->start = cl->buf->pos;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1123 b->pos = cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1124 b->last = cl->buf->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1125 b->end = cl->buf->end;
6067 231a5bbd9e9c Request body: always flush buffers if request buffering is off. Valentin Bartenev <vbart@nginx.com> parents: 6050 diff changeset	1126 b->flush = r->request_body_no_buffering;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1127
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1128 *ll = tl;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1129 ll = &tl->next;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1130
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1131 size = cl->buf->last - cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1132
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1133 if ((off_t) size > rb->chunked->size) {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5210 diff changeset	1134 cl->buf->pos += (size_t) rb->chunked->size;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1135 r->headers_in.content_length_n += rb->chunked->size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1136 rb->chunked->size = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1137
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1138 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1139 rb->chunked->size -= size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1140 r->headers_in.content_length_n += size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1141 cl->buf->pos = cl->buf->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1142 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1143
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1144 b->last = cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1145
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1146 continue;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1147 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1148
8086 9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1149 if (rc == NGX_AGAIN && cl->buf->last_buf) {
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1150
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1151 /* last body buffer */
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1152
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1153 if (rb->chunked->length > 0) {
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1154 ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1155 "client prematurely closed connection");
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1156 r->connection->error = 1;
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1157 return NGX_HTTP_BAD_REQUEST;
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1158 }
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1159
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1160 rc = NGX_DONE;
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1161 }
9ffef6054abf HTTP/3: fixed handling request body eof. Roman Arutyunyan <arut@nginx.com> parents: 8067 diff changeset	1162
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1163 if (rc == NGX_DONE) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1164
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1165 /* a whole response has been parsed successfully */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1166
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1167 rb->rest = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1168
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1169 tl = ngx_chain_get_free_buf(r->pool, &rb->free);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1170 if (tl == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1171 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1172 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1173
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1174 b = tl->buf;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1175
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1176 ngx_memzero(b, sizeof(ngx_buf_t));
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1177
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1178 b->last_buf = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1179
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1180 *ll = tl;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1181 ll = &tl->next;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1182
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1183 break;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1184 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1185
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1186 if (rc == NGX_AGAIN) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1187
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1188 /* set rb->rest, amount of data we want to see next time */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1189
8037 0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	1190 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	1191
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	1192 rb->rest = ngx_max(rb->chunked->length,
0f7f1a509113 Request body: allowed large reads on chunk boundaries. Maxim Dounin <mdounin@mdounin.ru> parents: 8036 diff changeset	1193 (off_t) cscf->large_client_header_buffers.size);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1194
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1195 break;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1196 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1197
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1198 /* invalid */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1199
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1200 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1201 "client sent invalid chunked body");
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1202
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1203 return NGX_HTTP_BAD_REQUEST;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1204 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1205 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1206
6049 42d9beeb22db Request body: filters support. Maxim Dounin <mdounin@mdounin.ru> parents: 6048 diff changeset	1207 rc = ngx_http_top_request_body_filter(r, out);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1208
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1209 ngx_chain_update_chains(r->pool, &rb->free, &rb->busy, &out,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1210 (ngx_buf_tag_t) &ngx_http_read_client_request_body);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1211
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1212 return rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1213 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1214
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1215
6049 42d9beeb22db Request body: filters support. Maxim Dounin <mdounin@mdounin.ru> parents: 6048 diff changeset	1216 ngx_int_t
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1217 ngx_http_request_body_save_filter(ngx_http_request_t r, ngx_chain_t in)
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1218 {
6420 3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1219 ngx_buf_t *b;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1220 ngx_chain_t *cl;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1221 ngx_http_request_body_t *rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1222
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1223 rb = r->request_body;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1224
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1225 #if (NGX_DEBUG)
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1226
6904 5e2423bce883 Request body: commented out debug printing of old buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 6903 diff changeset	1227 #if 0
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1228 for (cl = rb->bufs; cl; cl = cl->next) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1229 ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1230 "http body old buf t:%d f:%d %p, pos %p, size: %z "
6044 b8926ba4d087 Format specifier fixed for file size of buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 5588 diff changeset	1231 "file: %O, size: %O",
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1232 cl->buf->temporary, cl->buf->in_file,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1233 cl->buf->start, cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1234 cl->buf->last - cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1235 cl->buf->file_pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1236 cl->buf->file_last - cl->buf->file_pos);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1237 }
6904 5e2423bce883 Request body: commented out debug printing of old buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 6903 diff changeset	1238 #endif
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1239
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1240 for (cl = in; cl; cl = cl->next) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1241 ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1242 "http body new buf t:%d f:%d %p, pos %p, size: %z "
6044 b8926ba4d087 Format specifier fixed for file size of buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 5588 diff changeset	1243 "file: %O, size: %O",
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1244 cl->buf->temporary, cl->buf->in_file,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1245 cl->buf->start, cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1246 cl->buf->last - cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1247 cl->buf->file_pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1248 cl->buf->file_last - cl->buf->file_pos);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1249 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1250
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1251 #endif
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1252
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1253 /* TODO: coalesce neighbouring buffers */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1254
4936 240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	1255 if (ngx_chain_add_copy(r->pool, &rb->bufs, in) != NGX_OK) {
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	1256 return NGX_HTTP_INTERNAL_SERVER_ERROR;
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	1257 }
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1258
6420 3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1259 if (r->request_body_no_buffering) {
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1260 return NGX_OK;
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1261 }
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1262
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1263 if (rb->rest > 0) {
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1264
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1265 if (rb->buf && rb->buf->last == rb->buf->end
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1266 && ngx_http_write_request_body(r) != NGX_OK)
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1267 {
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1268 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1269 }
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1270
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1271 return NGX_OK;
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1272 }
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1273
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1274 /* rb->rest == 0 */
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1275
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1276 if (rb->temp_file \|\| r->request_body_in_file_only) {
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1277
6048 9e231d4cecca Request body: moved request body writing to save filter. Maxim Dounin <mdounin@mdounin.ru> parents: 6047 diff changeset	1278 if (ngx_http_write_request_body(r) != NGX_OK) {
9e231d4cecca Request body: moved request body writing to save filter. Maxim Dounin <mdounin@mdounin.ru> parents: 6047 diff changeset	1279 return NGX_HTTP_INTERNAL_SERVER_ERROR;
9e231d4cecca Request body: moved request body writing to save filter. Maxim Dounin <mdounin@mdounin.ru> parents: 6047 diff changeset	1280 }
6420 3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1281
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1282 if (rb->temp_file->file.offset != 0) {
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1283
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1284 cl = ngx_chain_get_free_buf(r->pool, &rb->free);
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1285 if (cl == NULL) {
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1286 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1287 }
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1288
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1289 b = cl->buf;
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1290
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1291 ngx_memzero(b, sizeof(ngx_buf_t));
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1292
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1293 b->in_file = 1;
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1294 b->file_last = rb->temp_file->file.offset;
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1295 b->file = &rb->temp_file->file;
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1296
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1297 rb->bufs = cl;
3b9fe734a76c Request body: moved handling of the last part in the save filter. Valentin Bartenev <vbart@nginx.com> parents: 6336 diff changeset	1298 }
6048 9e231d4cecca Request body: moved request body writing to save filter. Maxim Dounin <mdounin@mdounin.ru> parents: 6047 diff changeset	1299 }
9e231d4cecca Request body: moved request body writing to save filter. Maxim Dounin <mdounin@mdounin.ru> parents: 6047 diff changeset	1300
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1301 return NGX_OK;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1302 }

Mercurial > hg > nginx-quic

annotate src/http/ngx_http_request_body.c @ 8240:43f3574b3e6f quic