nginx: src/http/ngx_http_request

annotate src/http/ngx_http_request_body.c @ 5626:2411d4b5be2c

SPDY: better detect if headers block has wrong entries count. Previously, only one case was checked: if there's more data to parse in a r->header_in buffer, but the buffer can be filled to the end by the last parsed entry, so we also need to check that there's no more data to inflate.

author	Valentin Bartenev <vbart@nginx.com>
date	Wed, 26 Mar 2014 18:01:11 +0400
parents	6fc3921025f0
children	b8926ba4d087

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);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	15 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	16 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	17 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	18 ngx_buf_t *b);
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	19 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	20
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	21 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	22 ngx_chain_t *in);
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_length_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_chunked_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_save_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;
43cb2c9799c1 Request body: fixed client_body_in_file_only. Maxim Dounin <mdounin@mdounin.ru> parents: 4937 diff changeset	39 ngx_chain_t out, *cl;
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
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	45 #if (NGX_HTTP_SPDY)
5440 cbb9a6c7493c SPDY: fixed request hang with the auth request module. Valentin Bartenev <vbart@nginx.com> parents: 5359 diff changeset	46 if (r->spdy_stream && r == r->main) {
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	47 rc = ngx_http_spdy_read_request_body(r, post_handler);
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	48 goto done;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	49 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	50 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	51
5174 f458156fd46a Request body: only read body in main request (ticket #330). Maxim Dounin <mdounin@mdounin.ru> parents: 5121 diff changeset	52 if (r != r->main \|\| r->request_body \|\| r->discard_body) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	53 post_handler(r);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	54 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	55 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	56
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	57 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	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;
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	60 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	61
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	62 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	63 if (rb == NULL) {
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	64 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	65 goto done;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	66 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	67
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	68 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	69 * set by ngx_pcalloc():
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 * rb->bufs = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	72 * rb->buf = NULL;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	73 * rb->free = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	74 * rb->busy = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	75 * rb->chunked = NULL;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	76 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	77
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	78 rb->rest = -1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	79 rb->post_handler = post_handler;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	80
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	81 r->request_body = rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	82
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	83 if (r->headers_in.content_length_n < 0 && !r->headers_in.chunked) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	84 post_handler(r);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	85 return NGX_OK;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	86 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	87
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	88 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	89
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	90 if (preread) {
296 bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	91
bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	92 /* 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	93
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	94 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	95 "http client request body preread %uz", preread);
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	96
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	97 out.buf = r->header_in;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	98 out.next = NULL;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	99
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	100 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	101
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	102 if (rc != NGX_OK) {
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	103 goto done;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	104 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	105
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	106 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	107
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	108 if (!r->headers_in.chunked
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	109 && rb->rest > 0
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	110 && 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	111 {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	112 /* 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	113
5111 57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	114 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	115 if (b == NULL) {
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	116 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	117 goto done;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	118 }
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	119
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	120 b->temporary = 1;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	121 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	122 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	123 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	124 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	125
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	126 rb->buf = b;
57c3f84d72ce Request body: avoid linking rb->buf to r->header_in. Maxim Dounin <mdounin@mdounin.ru> parents: 5110 diff changeset	127
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	128 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	129 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	130
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	131 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	132 goto done;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	133 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	134
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	135 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	136 /* set rb->rest */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	137
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	138 if (ngx_http_request_body_filter(r, NULL) != NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	139 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	140 goto done;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	141 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	142 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	143
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	144 if (rb->rest == 0) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	145 /* the whole request body was pre-read */
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	146
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	147 if (r->request_body_in_file_only) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	148 if (ngx_http_write_request_body(r) != NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	149 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	150 goto done;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	151 }
5025 43cb2c9799c1 Request body: fixed client_body_in_file_only. Maxim Dounin <mdounin@mdounin.ru> parents: 4937 diff changeset	152
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	153 if (rb->temp_file->file.offset != 0) {
5025 43cb2c9799c1 Request body: fixed client_body_in_file_only. Maxim Dounin <mdounin@mdounin.ru> parents: 4937 diff changeset	154
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	155 cl = ngx_chain_get_free_buf(r->pool, &rb->free);
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	156 if (cl == NULL) {
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	157 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	158 goto done;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	159 }
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	160
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	161 b = cl->buf;
5025 43cb2c9799c1 Request body: fixed client_body_in_file_only. Maxim Dounin <mdounin@mdounin.ru> parents: 4937 diff changeset	162
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	163 ngx_memzero(b, sizeof(ngx_buf_t));
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	164
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	165 b->in_file = 1;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	166 b->file_last = rb->temp_file->file.offset;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	167 b->file = &rb->temp_file->file;
5025 43cb2c9799c1 Request body: fixed client_body_in_file_only. Maxim Dounin <mdounin@mdounin.ru> parents: 4937 diff changeset	168
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	169 rb->bufs = cl;
5025 43cb2c9799c1 Request body: fixed client_body_in_file_only. Maxim Dounin <mdounin@mdounin.ru> parents: 4937 diff changeset	170
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	171 } else {
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	172 rb->bufs = NULL;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	173 }
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	174 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	175
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	176 post_handler(r);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	177
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	178 return NGX_OK;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	179 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	180
4936 240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	181 if (rb->rest < 0) {
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	182 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	183 "negative request body rest");
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	184 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	185 goto done;
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	186 }
240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	187
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	188 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	189
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	190 size = clcf->client_body_buffer_size;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	191 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	192
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	193 /* TODO: honor r->request_body_in_single_buf */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	194
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	195 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	196 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	197
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	198 if (r->request_body_in_single_buf) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	199 size += preread;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	200 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	201
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	202 } else {
303 00c5660d2707 nginx-0.0.3-2004-04-01-20:20:53 import Igor Sysoev <igor@sysoev.ru> parents: 299 diff changeset	203 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	204 }
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	205
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	206 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	207 if (rb->buf == NULL) {
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	208 rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	209 goto done;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	210 }
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	211
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	212 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	213 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	214
4923 57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	215 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	216
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	217 done:
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	218
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	219 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	220 r->main->count--;
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	221 }
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	222
57174af2e695 Request body: fixed socket leak on errors. Maxim Dounin <mdounin@mdounin.ru> parents: 4922 diff changeset	223 return rc;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	224 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	225
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	226
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	227 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	228 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	229 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	230 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	231
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	232 if (r->connection->read->timedout) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	233 r->connection->timedout = 1;
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	234 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	235 return;
46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	236 }
46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	237
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	238 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	239
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	240 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	241 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	242 }
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	243 }
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	244
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	245
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	246 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	247 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	248 {
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	249 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	250 size_t size;
87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 171 diff changeset	251 ssize_t n;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	252 ngx_int_t rc;
343 6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 303 diff changeset	253 ngx_buf_t *b;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	254 ngx_chain_t *cl, out;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	255 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	256 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	257 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	258
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	259 c = r->connection;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	260 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	261
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	262 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	263 "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	264
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	265 for ( ;; ) {
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	266 for ( ;; ) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	267 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	268
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	269 /* pass buffer to request body filter chain */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	270
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	271 out.buf = rb->buf;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	272 out.next = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	273
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	274 rc = ngx_http_request_body_filter(r, &out);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	275
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	276 if (rc != NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	277 return rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	278 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	279
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	280 /* write to file */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	281
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	282 if (ngx_http_write_request_body(r) != NGX_OK) {
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	283 return NGX_HTTP_INTERNAL_SERVER_ERROR;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	284 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	285
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	286 /* update chains */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	287
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	288 rc = ngx_http_request_body_filter(r, NULL);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	289
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	290 if (rc != NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	291 return rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	292 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	293
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	294 if (rb->busy != NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	295 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	296 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	297
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	298 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	299 rb->buf->last = rb->buf->start;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	300 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	301
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	302 size = rb->buf->end - rb->buf->last;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	303 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	304
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	305 if ((off_t) size > rest) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	306 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	307 }
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	308
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	309 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	310
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	311 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	312 "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	313
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	314 if (n == NGX_AGAIN) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	315 break;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	316 }
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 if (n == 0) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	319 ngx_log_error(NGX_LOG_INFO, c->log, 0,
4593 834049edae24 Fixed grammar in error messages. Ruslan Ermilov <ru@nginx.com> parents: 4412 diff changeset	320 "client prematurely closed connection");
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	321 }
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	322
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	323 if (n == 0 \|\| n == NGX_ERROR) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	324 c->error = 1;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	325 return NGX_HTTP_BAD_REQUEST;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	326 }
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 rb->buf->last += n;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	329 r->request_length += n;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	330
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	331 if (n == rest) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	332 /* pass buffer to request body filter chain */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	333
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	334 out.buf = rb->buf;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	335 out.next = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	336
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	337 rc = ngx_http_request_body_filter(r, &out);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	338
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	339 if (rc != NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	340 return rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	341 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	342 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	343
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	344 if (rb->rest == 0) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	345 break;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	346 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	347
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	348 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	349 break;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	350 }
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	351 }
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	352
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	353 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
1112 3dcc3041b5bc fix format Igor Sysoev <igor@sysoev.ru> parents: 1075 diff changeset	354 "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	355
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	356 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	357 break;
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 293 diff changeset	358 }
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 293 diff changeset	359
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	360 if (!c->read->ready) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	361 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	362 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	363
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	364 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	365 return NGX_HTTP_INTERNAL_SERVER_ERROR;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	366 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	367
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	368 return NGX_AGAIN;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	369 }
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	370 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	371
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	372 if (c->read->timer_set) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	373 ngx_del_timer(c->read);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	374 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	375
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	376 if (rb->temp_file \|\| r->request_body_in_file_only) {
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	377
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	378 /* save the last part */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	379
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	380 if (ngx_http_write_request_body(r) != NGX_OK) {
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	381 return NGX_HTTP_INTERNAL_SERVER_ERROR;
162 96993d4d5067 nginx-0.0.1-2003-10-28-00:01:00 import Igor Sysoev <igor@sysoev.ru> parents: 160 diff changeset	382 }
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	383
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	384 if (rb->temp_file->file.offset != 0) {
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	385
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	386 cl = ngx_chain_get_free_buf(r->pool, &rb->free);
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	387 if (cl == NULL) {
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	388 return NGX_HTTP_INTERNAL_SERVER_ERROR;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	389 }
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	390
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	391 b = cl->buf;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	392
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	393 ngx_memzero(b, sizeof(ngx_buf_t));
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	394
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	395 b->in_file = 1;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	396 b->file_last = rb->temp_file->file.offset;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	397 b->file = &rb->temp_file->file;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	398
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	399 rb->bufs = cl;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	400
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	401 } else {
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	402 rb->bufs = NULL;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	403 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	404 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	405
4072 cf334deeea66 Bugfix: read event was not blocked after reading body. Maxim Dounin <mdounin@mdounin.ru> parents: 4006 diff changeset	406 r->read_event_handler = ngx_http_block_reading;
cf334deeea66 Bugfix: read event was not blocked after reading body. Maxim Dounin <mdounin@mdounin.ru> parents: 4006 diff changeset	407
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	408 rb->post_handler(r);
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	409
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	410 return NGX_OK;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	411 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	412
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	413
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	414 static ngx_int_t
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	415 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	416 {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	417 ssize_t n;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	418 ngx_chain_t *cl;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	419 ngx_temp_file_t *tf;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	420 ngx_http_request_body_t *rb;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	421 ngx_http_core_loc_conf_t *clcf;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	422
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	423 rb = r->request_body;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	424
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	425 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	426 "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	427
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	428 if (rb->temp_file == NULL) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	429 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	430 if (tf == NULL) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	431 return NGX_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	432 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	433
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	434 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	435
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	436 tf->file.fd = NGX_INVALID_FILE;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	437 tf->file.log = r->connection->log;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	438 tf->path = clcf->client_body_temp_path;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	439 tf->pool = r->pool;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	440 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	441 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	442 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	443 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	444
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	445 if (r->request_body_file_group_access) {
1046 bb139aba3199 rename mode to access Igor Sysoev <igor@sysoev.ru> parents: 841 diff changeset	446 tf->access = 0660;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	447 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	448
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	449 rb->temp_file = tf;
4922 dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	450
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	451 if (rb->bufs == NULL) {
4922 dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	452 /* 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	453
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	454 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	455 tf->persistent, tf->clean, tf->access)
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	456 != NGX_OK)
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	457 {
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	458 return NGX_ERROR;
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	459 }
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	460
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	461 return NGX_OK;
dfa586842962 Request body: code duplication reduced, no functional changes. Maxim Dounin <mdounin@mdounin.ru> parents: 4593 diff changeset	462 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	463 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	464
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	465 if (rb->bufs == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	466 return NGX_OK;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	467 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	468
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	469 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	470
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	471 /* 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	472
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	473 if (n == NGX_ERROR) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	474 return NGX_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	475 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	476
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	477 rb->temp_file->offset += n;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	478
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	479 /* mark all buffers as written */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	480
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	481 for (cl = rb->bufs; cl; cl = cl->next) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	482 cl->buf->pos = cl->buf->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	483 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	484
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	485 rb->bufs = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	486
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	487 return NGX_OK;
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
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	490
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	491 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	492 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	493 {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	494 ssize_t size;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	495 ngx_int_t rc;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	496 ngx_event_t *rev;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	497
5121 c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	498 #if (NGX_HTTP_SPDY)
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	499 if (r->spdy_stream && r == r->main) {
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	500 r->spdy_stream->skip_data = NGX_SPDY_DATA_DISCARD;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	501 return NGX_OK;
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	502 }
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	503 #endif
c0f7b94e88ba Preliminary experimental support for SPDY draft 2. Valentin Bartenev <vbart@nginx.com> parents: 5111 diff changeset	504
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	505 if (r != r->main \|\| r->discard_body \|\| r->request_body) {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	506 return NGX_OK;
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
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	509 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	510 return NGX_HTTP_INTERNAL_SERVER_ERROR;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	511 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	512
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	513 rev = r->connection->read;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	514
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	515 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	516
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	517 if (rev->timer_set) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	518 ngx_del_timer(rev);
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
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	521 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	522 return NGX_OK;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	523 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	524
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	525 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	526
4934 b61edaa04342 Request body: fixed discard of chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4931 diff changeset	527 if (size \|\| r->headers_in.chunked) {
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	528 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	529
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	530 if (rc != NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	531 return rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	532 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	533
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	534 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	535 return NGX_OK;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	536 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	537 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	538
4935 7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	539 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	540
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	541 if (rc == NGX_OK) {
4924 caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	542 r->lingering_close = 0;
caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	543 return NGX_OK;
caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	544 }
caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	545
4935 7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	546 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	547 return rc;
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	548 }
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	549
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	550 /* rc == NGX_AGAIN */
4924 caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	551
3214 798a7f1d3b2f restore discard body handler after ngx_http_set_writer() set it to Igor Sysoev <igor@sysoev.ru> parents: 3213 diff changeset	552 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	553
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	554 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	555 return NGX_HTTP_INTERNAL_SERVER_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	556 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	557
4924 caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	558 r->count++;
caca5603bded Request body: properly handle events while discarding body. Maxim Dounin <mdounin@mdounin.ru> parents: 4923 diff changeset	559 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	560
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	561 return NGX_OK;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	562 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	563
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	564
3214 798a7f1d3b2f restore discard body handler after ngx_http_set_writer() set it to Igor Sysoev <igor@sysoev.ru> parents: 3213 diff changeset	565 void
798a7f1d3b2f restore discard body handler after ngx_http_set_writer() set it to Igor Sysoev <igor@sysoev.ru> parents: 3213 diff changeset	566 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	567 {
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	568 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	569 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	570 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	571 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	572 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	573
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	574 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	575 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	576
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	577 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	578 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	579 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	580 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	581 return;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	582 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	583
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	584 if (r->lingering_time) {
5210 ea2ba6dbe361 Fixed lingering_time check. Maxim Dounin <mdounin@mdounin.ru> parents: 5199 diff changeset	585 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	586
5210 ea2ba6dbe361 Fixed lingering_time check. Maxim Dounin <mdounin@mdounin.ru> parents: 5199 diff changeset	587 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	588 r->discard_body = 0;
3181 36f6407817dc clear r->lingering_close to disable preventively calling Igor Sysoev <igor@sysoev.ru> parents: 3179 diff changeset	589 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	590 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	591 return;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	592 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	593
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	594 } else {
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	595 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	596 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	597
1370 cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	598 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	599
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	600 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	601 r->discard_body = 0;
3181 36f6407817dc clear r->lingering_close to disable preventively calling Igor Sysoev <igor@sysoev.ru> parents: 3179 diff changeset	602 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	603 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	604 return;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	605 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	606
4935 7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	607 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	608 c->error = 1;
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	609 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	610 return;
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	611 }
7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	612
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	613 /* 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	614
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	615 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
1456 698ea64f71e1 fix unlikely socket leak Igor Sysoev <igor@sysoev.ru> parents: 1455 diff changeset	616 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	617 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	618 return;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	619 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	620
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	621 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	622
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	623 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	624
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	625 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	626
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	627 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	628 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	629 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	630
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	631 ngx_add_timer(rev, timer);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	632 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	633 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	634
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	635
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	636 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	637 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	638 {
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	639 size_t size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	640 ssize_t n;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	641 ngx_int_t rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	642 ngx_buf_t b;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	643 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	644
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	645 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	646 "http read discarded body");
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	647
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	648 ngx_memzero(&b, sizeof(ngx_buf_t));
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	649
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	650 b.temporary = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	651
3162 9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	652 for ( ;; ) {
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	653 if (r->headers_in.content_length_n == 0) {
1369 6254b90eea4b block reading for level events Igor Sysoev <igor@sysoev.ru> parents: 1367 diff changeset	654 r->read_event_handler = ngx_http_block_reading;
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	655 return NGX_OK;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	656 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	657
3162 9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	658 if (!r->connection->read->ready) {
9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	659 return NGX_AGAIN;
9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	660 }
9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	661
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	662 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	663 NGX_HTTP_DISCARD_BUFFER_SIZE);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	664
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	665 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	666
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	667 if (n == NGX_ERROR) {
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	668 r->connection->error = 1;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	669 return NGX_OK;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	670 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	671
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	672 if (n == NGX_AGAIN) {
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	673 return NGX_AGAIN;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	674 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	675
1422 65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	676 if (n == 0) {
65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	677 return NGX_OK;
65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	678 }
65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	679
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	680 b.pos = buffer;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	681 b.last = buffer + n;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	682
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	683 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	684
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	685 if (rc != NGX_OK) {
4935 7bd1c839af3b Request body: improved handling of incorrect chunked request body. Maxim Dounin <mdounin@mdounin.ru> parents: 4934 diff changeset	686 return rc;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	687 }
3162 9140fbb2ab83 fix discarding body Igor Sysoev <igor@sysoev.ru> parents: 3077 diff changeset	688 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	689 }
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	690
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	691
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	692 static ngx_int_t
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	693 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	694 {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	695 size_t size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	696 ngx_int_t rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	697 ngx_http_request_body_t *rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	698
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	699 if (r->headers_in.chunked) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	700
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	701 rb = r->request_body;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	702
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	703 if (rb == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	704
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	705 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	706 if (rb == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	707 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	708 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	709
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	710 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	711 if (rb->chunked == NULL) {
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	712 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	713 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	714
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	715 r->request_body = rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	716 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	717
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	718 for ( ;; ) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	719
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	720 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	721
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	722 if (rc == NGX_OK) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	723
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	724 /* a chunk has been parsed successfully */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	725
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	726 size = b->last - b->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	727
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	728 if ((off_t) size > rb->chunked->size) {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5210 diff changeset	729 b->pos += (size_t) rb->chunked->size;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	730 rb->chunked->size = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	731
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	732 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	733 rb->chunked->size -= size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	734 b->pos = b->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	735 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	736
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	737 continue;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	738 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	739
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	740 if (rc == NGX_DONE) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	741
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	742 /* a whole response has been parsed successfully */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	743
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	744 r->headers_in.content_length_n = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	745 break;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	746 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	747
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	748 if (rc == NGX_AGAIN) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	749
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	750 /* 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	751
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	752 r->headers_in.content_length_n = rb->chunked->length;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	753 break;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	754 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	755
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	756 /* invalid */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	757
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	758 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	759 "client sent invalid chunked body");
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	760
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	761 return NGX_HTTP_BAD_REQUEST;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	762 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	763
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	764 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	765 size = b->last - b->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	766
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	767 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	768 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	769 r->headers_in.content_length_n = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	770
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	771 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	772 b->pos = b->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	773 r->headers_in.content_length_n -= size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	774 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	775 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	776
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	777 return NGX_OK;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	778 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	779
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	780
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	781 static ngx_int_t
2436 26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	782 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	783 {
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	784 ngx_int_t n;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	785 ngx_str_t *expect;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	786
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	787 if (r->expect_tested
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	788 \|\| r->headers_in.expect == NULL
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	789 \|\| r->http_version < NGX_HTTP_VERSION_11)
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	790 {
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	791 return NGX_OK;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	792 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	793
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	794 r->expect_tested = 1;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	795
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	796 expect = &r->headers_in.expect->value;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	797
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	798 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	799 \|\| 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	800 sizeof("100-continue") - 1)
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	801 != 0)
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	802 {
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	803 return NGX_OK;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	804 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	805
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	806 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	807 "send 100 Continue");
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	808
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	809 n = r->connection->send(r->connection,
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	810 (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	811 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	812
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	813 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	814 return NGX_OK;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	815 }
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	816
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	817 /* 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	818
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	819 return NGX_ERROR;
26d9d4a41e91 send "100 Continue" just before reading request body Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	820 }
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	821
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	822
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	823 static ngx_int_t
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	824 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	825 {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	826 if (r->headers_in.chunked) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	827 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	828
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	829 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	830 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	831 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	832 }
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
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	835 static ngx_int_t
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	836 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	837 {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	838 size_t size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	839 ngx_int_t rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	840 ngx_buf_t *b;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	841 ngx_chain_t cl, tl, out, *ll;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	842 ngx_http_request_body_t *rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	843
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	844 rb = r->request_body;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	845
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	846 if (rb->rest == -1) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	847 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	848 "http request body content length filter");
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 rb->rest = r->headers_in.content_length_n;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	851 }
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 out = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	854 ll = &out;
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 for (cl = in; cl; cl = cl->next) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	857
5502 4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	858 if (rb->rest == 0) {
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	859 break;
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	860 }
4aa64f695031 Fixed "zero size buf in output" alerts. Maxim Dounin <mdounin@mdounin.ru> parents: 5440 diff changeset	861
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	862 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	863 if (tl == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	864 return NGX_HTTP_INTERNAL_SERVER_ERROR;
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
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	867 b = tl->buf;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	868
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	869 ngx_memzero(b, sizeof(ngx_buf_t));
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 b->temporary = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	872 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	873 b->start = cl->buf->pos;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	874 b->pos = cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	875 b->last = cl->buf->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	876 b->end = cl->buf->end;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	877
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	878 size = cl->buf->last - cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	879
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	880 if ((off_t) size < rb->rest) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	881 cl->buf->pos = cl->buf->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	882 rb->rest -= size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	883
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	884 } else {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5210 diff changeset	885 cl->buf->pos += (size_t) rb->rest;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	886 rb->rest = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	887 b->last = cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	888 b->last_buf = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	889 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	890
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	891 *ll = tl;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	892 ll = &tl->next;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	893 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	894
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	895 rc = ngx_http_request_body_save_filter(r, out);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	896
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	897 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	898 (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	899
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	900 return rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	901 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	902
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	903
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	904 static ngx_int_t
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	905 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	906 {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	907 size_t size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	908 ngx_int_t rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	909 ngx_buf_t *b;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	910 ngx_chain_t cl, out, tl, *ll;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	911 ngx_http_request_body_t *rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	912 ngx_http_core_loc_conf_t *clcf;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	913
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	914 rb = r->request_body;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	915
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	916 if (rb->rest == -1) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	917
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	918 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	919 "http request body chunked filter");
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	920
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	921 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	922 if (rb->chunked == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	923 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	924 }
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 r->headers_in.content_length_n = 0;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	927 rb->rest = 3;
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 out = NULL;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	931 ll = &out;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	932
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	933 for (cl = in; cl; cl = cl->next) {
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 for ( ;; ) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	936
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	937 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	938 "http body chunked buf "
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	939 "t:%d f:%d %p, pos %p, size: %z file: %O, size: %z",
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	940 cl->buf->temporary, cl->buf->in_file,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	941 cl->buf->start, cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	942 cl->buf->last - cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	943 cl->buf->file_pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	944 cl->buf->file_last - cl->buf->file_pos);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	945
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	946 rc = ngx_http_parse_chunked(r, cl->buf, rb->chunked);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	947
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	948 if (rc == NGX_OK) {
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 /* a chunk has been parsed successfully */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	951
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	952 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	953
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	954 if (clcf->client_max_body_size
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	955 && clcf->client_max_body_size
5588 6fc3921025f0 Request body: avoid potential overflow. Maxim Dounin <mdounin@mdounin.ru> parents: 5502 diff changeset	956 - 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	957 {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	958 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	959 "client intended to send too large chunked "
5588 6fc3921025f0 Request body: avoid potential overflow. Maxim Dounin <mdounin@mdounin.ru> parents: 5502 diff changeset	960 "body: %O+%O bytes",
6fc3921025f0 Request body: avoid potential overflow. Maxim Dounin <mdounin@mdounin.ru> parents: 5502 diff changeset	961 r->headers_in.content_length_n,
6fc3921025f0 Request body: avoid potential overflow. Maxim Dounin <mdounin@mdounin.ru> parents: 5502 diff changeset	962 rb->chunked->size);
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	963
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	964 r->lingering_close = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	965
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	966 return NGX_HTTP_REQUEST_ENTITY_TOO_LARGE;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	967 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	968
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	969 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	970 if (tl == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	971 return NGX_HTTP_INTERNAL_SERVER_ERROR;
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
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	974 b = tl->buf;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	975
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	976 ngx_memzero(b, sizeof(ngx_buf_t));
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	977
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	978 b->temporary = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	979 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	980 b->start = cl->buf->pos;
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	981 b->pos = cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	982 b->last = cl->buf->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	983 b->end = cl->buf->end;
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 *ll = tl;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	986 ll = &tl->next;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	987
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	988 size = cl->buf->last - cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	989
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	990 if ((off_t) size > rb->chunked->size) {
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5210 diff changeset	991 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	992 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	993 rb->chunked->size = 0;
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 } else {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	996 rb->chunked->size -= size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	997 r->headers_in.content_length_n += size;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	998 cl->buf->pos = cl->buf->last;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	999 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1000
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1001 b->last = cl->buf->pos;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1002
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1003 continue;
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
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1006 if (rc == NGX_DONE) {
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 /* a whole response has been parsed successfully */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1009
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1010 rb->rest = 0;
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 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	1013 if (tl == NULL) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1014 return NGX_HTTP_INTERNAL_SERVER_ERROR;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1015 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1016
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1017 b = tl->buf;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1018
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1019 ngx_memzero(b, sizeof(ngx_buf_t));
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1020
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1021 b->last_buf = 1;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1022
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1023 *ll = tl;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1024 ll = &tl->next;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1025
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1026 break;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1027 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1028
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1029 if (rc == NGX_AGAIN) {
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 /* 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	1032
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1033 rb->rest = rb->chunked->length;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1034
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1035 break;
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 /* invalid */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1039
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1040 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	1041 "client sent invalid chunked body");
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1042
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1043 return NGX_HTTP_BAD_REQUEST;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1044 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1045 }
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 rc = ngx_http_request_body_save_filter(r, out);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1048
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1049 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	1050 (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	1051
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1052 return rc;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1053 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1054
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1055
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1056 static ngx_int_t
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1057 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	1058 {
4931 190fce68b6b5 Request body: unbreak build without debug. Maxim Dounin <mdounin@mdounin.ru> parents: 4930 diff changeset	1059 #if (NGX_DEBUG)
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1060 ngx_chain_t *cl;
4931 190fce68b6b5 Request body: unbreak build without debug. Maxim Dounin <mdounin@mdounin.ru> parents: 4930 diff changeset	1061 #endif
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1062 ngx_http_request_body_t *rb;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1063
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1064 rb = r->request_body;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1065
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1066 #if (NGX_DEBUG)
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1067
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1068 for (cl = rb->bufs; cl; cl = cl->next) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1069 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	1070 "http body old buf t:%d f:%d %p, pos %p, size: %z "
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1071 "file: %O, size: %z",
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1072 cl->buf->temporary, cl->buf->in_file,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1073 cl->buf->start, cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1074 cl->buf->last - cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1075 cl->buf->file_pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1076 cl->buf->file_last - cl->buf->file_pos);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1077 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1078
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1079 for (cl = in; cl; cl = cl->next) {
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1080 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	1081 "http body new buf t:%d f:%d %p, pos %p, size: %z "
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1082 "file: %O, size: %z",
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1083 cl->buf->temporary, cl->buf->in_file,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1084 cl->buf->start, cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1085 cl->buf->last - cl->buf->pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1086 cl->buf->file_pos,
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1087 cl->buf->file_last - cl->buf->file_pos);
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1088 }
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1089
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1090 #endif
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1091
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1092 /* TODO: coalesce neighbouring buffers */
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1093
4936 240e3fb392c9 Request body: error checking fixes, negative rb->rest handling. Maxim Dounin <mdounin@mdounin.ru> parents: 4935 diff changeset	1094 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	1095 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	1096 }
4930 6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1097
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1098 return NGX_OK;
6f085bfcdb4d Request body: chunked transfer encoding support. Maxim Dounin <mdounin@mdounin.ru> parents: 4924 diff changeset	1099 }

Mercurial > hg > nginx

annotate src/http/ngx_http_request_body.c @ 5626:2411d4b5be2c