nginx: src/http/ngx_http_request

annotate src/http/ngx_http_request_body.c @ 2388:722b5aff05ae

use "!= NGX_OK" instead of "== NGX_ERROR"

author	Igor Sysoev <igor@sysoev.ru>
date	Tue, 09 Dec 2008 17:27:48 +0000
parents	f62751dab60d
children	26d9d4a41e91

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
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	4 */
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
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	6
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 82 diff changeset	7 #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	8 #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	9 #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	10
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	12 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	13 static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	14 static ngx_int_t ngx_http_write_request_body(ngx_http_request_t *r,
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	15 ngx_chain_t *body);
1370 cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	16 static void ngx_http_read_discarded_request_body_handler(ngx_http_request_t *r);
cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	17 static ngx_int_t 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	18
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	19
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	20 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	21 * on completion ngx_http_read_client_request_body() adds to
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	22 * r->request_body->bufs one or two bufs:
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	23 * *) one memory buf that was preread in r->header_in;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	24 * *) one memory or file buf that contains the rest of the body
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	25 */
83 a7e45c45a95c nginx-0.0.1-2003-04-28-19:06:39 import Igor Sysoev <igor@sysoev.ru> parents: 82 diff changeset	26
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	27 ngx_int_t
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	28 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	29 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	30 {
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	31 size_t preread;
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	32 ssize_t size;
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	33 ngx_buf_t *b;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	34 ngx_chain_t cl, *next;
725 86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	35 ngx_temp_file_t *tf;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	36 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	37 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	38
537 c9ad0d9c7d59 nginx-0.1.43-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 527 diff changeset	39 if (r->request_body \|\| r->discard_body) {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	40 post_handler(r);
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	41 return NGX_OK;
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	42 }
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	43
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	44 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	45 if (rb == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	46 return NGX_HTTP_INTERNAL_SERVER_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	47 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	48
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	49 r->request_body = rb;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	50
725 86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	51 if (r->headers_in.content_length_n < 0) {
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	52 post_handler(r);
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	53 return NGX_OK;
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	54 }
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	55
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	56 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	57
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	58 if (r->headers_in.content_length_n == 0) {
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	59
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	60 if (r->request_body_in_file_only) {
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	61 tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	62 if (tf == NULL) {
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	63 return NGX_HTTP_INTERNAL_SERVER_ERROR;
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	64 }
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	65
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	66 tf->file.fd = NGX_INVALID_FILE;
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	67 tf->file.log = r->connection->log;
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	68 tf->path = clcf->client_body_temp_path;
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	69 tf->pool = r->pool;
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	70 tf->warn = "a client request body is buffered to a temporary file";
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	71 tf->log_level = r->request_body_file_log_level;
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	72 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	73 tf->clean = r->request_body_in_clean_file;
725 86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	74
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	75 if (r->request_body_file_group_access) {
1046 bb139aba3199 rename mode to access Igor Sysoev <igor@sysoev.ru> parents: 841 diff changeset	76 tf->access = 0660;
725 86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	77 }
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	78
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	79 rb->temp_file = tf;
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	80
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	81 if (ngx_create_temp_file(&tf->file, tf->path, tf->pool,
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	82 tf->persistent, tf->clean, tf->access)
725 86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	83 != NGX_OK)
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	84 {
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	85 return NGX_HTTP_INTERNAL_SERVER_ERROR;
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	86 }
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	87 }
86862ad988da fix segfault when zero length file is PUT Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	88
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	89 post_handler(r);
1290 4e6903652363 style fix Igor Sysoev <igor@sysoev.ru> parents: 1112 diff changeset	90
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	91 return NGX_OK;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	92 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	93
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	94 rb->post_handler = post_handler;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	95
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	96 /*
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	97 * set by ngx_pcalloc():
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	98 *
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	99 * rb->bufs = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	100 * rb->buf = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	101 * rb->rest = 0;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	102 */
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	103
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	104 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	105
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	106 if (preread) {
296 bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	107
bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	108 /* 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	109
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	110 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	111 "http client request body preread %uz", preread);
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	112
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	113 b = ngx_calloc_buf(r->pool);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	114 if (b == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	115 return NGX_HTTP_INTERNAL_SERVER_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	116 }
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	117
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	118 b->temporary = 1;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	119 b->start = r->header_in->pos;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	120 b->pos = r->header_in->pos;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	121 b->last = r->header_in->last;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	122 b->end = r->header_in->end;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	123
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	124 rb->bufs = ngx_alloc_chain_link(r->pool);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	125 if (rb->bufs == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	126 return NGX_HTTP_INTERNAL_SERVER_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	127 }
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	128
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	129 rb->bufs->buf = b;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	130 rb->bufs->next = NULL;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	131
667 63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 665 diff changeset	132 rb->buf = b;
63a820b0bc6c nginx-0.3.55-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 665 diff changeset	133
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	134 if ((off_t) preread >= r->headers_in.content_length_n) {
296 bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	135
bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	136 /* the whole request body was pre-read */
bfe099e3f5b4 nginx-0.0.3-2004-03-26-19:13:01 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	137
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	138 r->header_in->pos += (size_t) r->headers_in.content_length_n;
475 c3c2848fc081 nginx-0.1.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 461 diff changeset	139 r->request_length += r->headers_in.content_length_n;
299 46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	140
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	141 if (r->request_body_in_file_only) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	142 if (ngx_http_write_request_body(r, rb->bufs) != NGX_OK) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	143 return NGX_HTTP_INTERNAL_SERVER_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	144 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	145 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	146
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	147 post_handler(r);
299 46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	148
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	149 return NGX_OK;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	150 }
162 96993d4d5067 nginx-0.0.1-2003-10-28-00:01:00 import Igor Sysoev <igor@sysoev.ru> parents: 160 diff changeset	151
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	152 /*
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	153 * to not consider the body as pipelined request in
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	154 * ngx_http_set_keepalive()
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	155 */
162 96993d4d5067 nginx-0.0.1-2003-10-28-00:01:00 import Igor Sysoev <igor@sysoev.ru> parents: 160 diff changeset	156 r->header_in->pos = r->header_in->last;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	157
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	158 r->request_length += preread;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	159
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	160 rb->rest = r->headers_in.content_length_n - preread;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	161
665 5fd7a5e99047 nginx-0.3.54-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	162 if (rb->rest <= (off_t) (b->end - b->last)) {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	163
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	164 /* 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	165
1065 9039e845e532 fix segfault when a request body fits in r->header_in and Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	166 rb->to_write = rb->bufs;
9039e845e532 fix segfault when a request body fits in r->header_in and Igor Sysoev <igor@sysoev.ru> parents: 1046 diff changeset	167
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	168 r->read_event_handler = ngx_http_read_client_request_body_handler;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	169
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	170 return ngx_http_do_read_client_request_body(r);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	171 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	172
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	173 next = &rb->bufs->next;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	174
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	175 } else {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	176 b = NULL;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	177 rb->rest = r->headers_in.content_length_n;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	178 next = &rb->bufs;
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
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	181 size = clcf->client_body_buffer_size;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	182 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	183
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	184 if (rb->rest < size) {
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	185 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	186
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	187 if (r->request_body_in_single_buf) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	188 size += preread;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	189 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	190
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	191 } else {
303 00c5660d2707 nginx-0.0.3-2004-04-01-20:20:53 import Igor Sysoev <igor@sysoev.ru> parents: 299 diff changeset	192 size = clcf->client_body_buffer_size;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	193
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	194 /* disable copying buffer for r->request_body_in_single_buf */
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	195 b = NULL;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	196 }
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	197
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	198 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	199 if (rb->buf == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	200 return NGX_HTTP_INTERNAL_SERVER_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 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
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	203 cl = ngx_alloc_chain_link(r->pool);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	204 if (cl == NULL) {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	205 return NGX_HTTP_INTERNAL_SERVER_ERROR;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	206 }
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	207
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	208 cl->buf = rb->buf;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	209 cl->next = NULL;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	210
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	211 if (b && r->request_body_in_single_buf) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	212 size = b->last - b->pos;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	213 ngx_memcpy(rb->buf->pos, b->pos, size);
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	214 rb->buf->last += size;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	215
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	216 next = &rb->bufs;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	217 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	218
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	219 *next = cl;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	220
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	221 if (r->request_body_in_file_only \|\| r->request_body_in_single_buf) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	222 rb->to_write = rb->bufs;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	223
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	224 } else {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	225 rb->to_write = rb->bufs->next ? rb->bufs->next : rb->bufs;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	226 }
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	227
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	228 r->read_event_handler = ngx_http_read_client_request_body_handler;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	229
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	230 return ngx_http_do_read_client_request_body(r);
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	231 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	232
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	233
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	234 static void
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	235 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	236 {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	237 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	238
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	239 if (r->connection->read->timedout) {
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	240 r->connection->timedout = 1;
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	241 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	242 return;
46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	243 }
46b7eeb8a116 nginx-0.0.3-2004-03-30-19:59:50 import Igor Sysoev <igor@sysoev.ru> parents: 297 diff changeset	244
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	245 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	246
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	247 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
1075 4d203f76b757 undo "client_body_in_file_only any" Igor Sysoev <igor@sysoev.ru> parents: 1072 diff changeset	248 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	249 }
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	250 }
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	251
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	252
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	253 static ngx_int_t
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	254 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	255 {
290 87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 171 diff changeset	256 size_t size;
87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 171 diff changeset	257 ssize_t n;
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	258 ngx_buf_t *b;
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	259 ngx_connection_t *c;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	260 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	261 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	262
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	263 c = r->connection;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	264 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	265
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	266 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	267 "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	268
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	269 for ( ;; ) {
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	270 for ( ;; ) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	271 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	272
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	273 if (ngx_http_write_request_body(r, rb->to_write) != NGX_OK) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	274 return NGX_HTTP_INTERNAL_SERVER_ERROR;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	275 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	276
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	277 rb->to_write = rb->bufs->next ? rb->bufs->next : rb->bufs;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	278 rb->buf->last = rb->buf->start;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	279 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	280
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	281 size = rb->buf->end - rb->buf->last;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	282
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	283 if ((off_t) size > rb->rest) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	284 size = (size_t) rb->rest;
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	285 }
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	286
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	287 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	288
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	289 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	290 "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	291
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	292 if (n == NGX_AGAIN) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	293 break;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	294 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	295
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	296 if (n == 0) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	297 ngx_log_error(NGX_LOG_INFO, c->log, 0,
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	298 "client closed prematurely connection");
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	299 }
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	300
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	301 if (n == 0 \|\| n == NGX_ERROR) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	302 c->error = 1;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	303 return NGX_HTTP_BAD_REQUEST;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	304 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	305
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	306 rb->buf->last += n;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	307 rb->rest -= n;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	308 r->request_length += n;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	309
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	310 if (rb->rest == 0) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	311 break;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	312 }
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	313
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	314 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	315 break;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	316 }
292 a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	317 }
a472bfb778b3 nginx-0.0.3-2004-03-17-00:26:01 import Igor Sysoev <igor@sysoev.ru> parents: 290 diff changeset	318
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	319 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
1112 3dcc3041b5bc fix format Igor Sysoev <igor@sysoev.ru> parents: 1075 diff changeset	320 "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	321
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	322 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	323 break;
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 293 diff changeset	324 }
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 293 diff changeset	325
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	326 if (!c->read->ready) {
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	327 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	328 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	329
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	330 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	331 return NGX_HTTP_INTERNAL_SERVER_ERROR;
790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	332 }
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	333
841 790ed4eb762e fix big client body receiving with deferred accept() Igor Sysoev <igor@sysoev.ru> parents: 725 diff changeset	334 return NGX_AGAIN;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	335 }
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	336 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	337
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	338 if (c->read->timer_set) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	339 ngx_del_timer(c->read);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	340 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 537 diff changeset	341
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	342 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	343
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	344 /* save the last part */
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	345
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	346 if (ngx_http_write_request_body(r, rb->to_write) != NGX_OK) {
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	347 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	348 }
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	349
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	350 b = ngx_calloc_buf(r->pool);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 479 diff changeset	351 if (b == NULL) {
293 ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	352 return NGX_HTTP_INTERNAL_SERVER_ERROR;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	353 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	354
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	355 b->in_file = 1;
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	356 b->file_pos = 0;
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	357 b->file_last = rb->temp_file->file.offset;
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	358 b->file = &rb->temp_file->file;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	359
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	360 if (rb->bufs->next) {
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	361 rb->bufs->next->buf = b;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	362
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	363 } else {
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	364 rb->bufs->buf = b;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 83 diff changeset	365 }
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	366 }
fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	367
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	368 if (r->request_body_in_file_only && rb->bufs->next) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	369 rb->bufs = rb->bufs->next;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	370 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	371
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 475 diff changeset	372 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	373
ec3c049681fd nginx-0.0.3-2004-03-19-08:25:53 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	374 return NGX_OK;
82 fccdb921e8b8 nginx-0.0.1-2003-04-25-18:43:13 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	375 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	376
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	377
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	378 static ngx_int_t
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	379 ngx_http_write_request_body(ngx_http_request_t r, ngx_chain_t body)
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	380 {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	381 ssize_t n;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	382 ngx_temp_file_t *tf;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	383 ngx_http_request_body_t *rb;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	384 ngx_http_core_loc_conf_t *clcf;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	385
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	386 rb = r->request_body;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	387
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	388 if (rb->temp_file == NULL) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	389 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	390 if (tf == NULL) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	391 return NGX_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	392 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	393
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	394 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	395
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	396 tf->file.fd = NGX_INVALID_FILE;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	397 tf->file.log = r->connection->log;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	398 tf->path = clcf->client_body_temp_path;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	399 tf->pool = r->pool;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	400 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	401 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	402 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	403 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	404
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	405 if (r->request_body_file_group_access) {
1046 bb139aba3199 rename mode to access Igor Sysoev <igor@sysoev.ru> parents: 841 diff changeset	406 tf->access = 0660;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	407 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	408
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	409 rb->temp_file = tf;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	410 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	411
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	412 n = ngx_write_chain_to_temp_file(rb->temp_file, body);
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 /* 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	415
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	416 if (n == NGX_ERROR) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	417 return NGX_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	418 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	419
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	420 rb->temp_file->offset += n;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	421
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	422 return NGX_OK;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	423 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	424
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	425
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	426 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	427 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	428 {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	429 ssize_t size;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	430 ngx_event_t *rev;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	431
673 b80f94fa2197 nginx-0.3.58-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 667 diff changeset	432 if (r != r->main \|\| r->discard_body) {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	433 return NGX_OK;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	434 }
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 rev = r->connection->read;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	437
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	438 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	439
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	440 if (rev->timer_set) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	441 ngx_del_timer(rev);
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	442 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	443
1582 227152b66458 do not discard body if it has been already read Igor Sysoev <igor@sysoev.ru> parents: 1456 diff changeset	444 if (r->headers_in.content_length_n <= 0 \|\| r->request_body) {
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	445 return NGX_OK;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	446 }
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 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	449
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	450 if (size) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	451 if (r->headers_in.content_length_n > size) {
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	452 r->headers_in.content_length_n -= size;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	453
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	454 } else {
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	455 r->header_in->pos += (size_t) r->headers_in.content_length_n;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	456 r->headers_in.content_length_n = 0;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	457 return NGX_OK;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	458 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	459 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	460
1455 7f2adaebb81f fix socket leak introduced in r1374 when request header and body was Igor Sysoev <igor@sysoev.ru> parents: 1422 diff changeset	461 r->discard_body = 1;
7f2adaebb81f fix socket leak introduced in r1374 when request header and body was Igor Sysoev <igor@sysoev.ru> parents: 1422 diff changeset	462
1370 cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	463 r->read_event_handler = ngx_http_read_discarded_request_body_handler;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	464
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	465 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	466 return NGX_HTTP_INTERNAL_SERVER_ERROR;
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	467 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	468
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	469 (void) ngx_http_read_discarded_request_body(r);
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	470
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	471 return NGX_OK;
633 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
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	474
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	475 static void
1370 cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	476 ngx_http_read_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	477 {
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	478 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	479 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	480 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	481 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	482 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	483
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	484 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	485 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	486
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	487 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	488 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	489 c->error = 1;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	490 ngx_http_finalize_request(r, 0);
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	491 return;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	492 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	493
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	494 if (r->lingering_time) {
1640 02a22cd5282a 64-bit time_t compatibility Igor Sysoev <igor@sysoev.ru> parents: 1582 diff changeset	495 timer = (ngx_msec_t) (r->lingering_time - 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	496
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	497 if (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	498 r->discard_body = 0;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	499 ngx_http_finalize_request(r, 0);
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	500 return;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	501 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	502
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	503 } else {
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	504 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	505 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	506
1370 cc114c85be0f rename ngx_http_discard_body() to ngx_http_discard_request_body() Igor Sysoev <igor@sysoev.ru> parents: 1369 diff changeset	507 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	508
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	509 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	510
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	511 r->discard_body = 0;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	512
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	513 if (r->done) {
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	514 ngx_http_finalize_request(r, 0);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	515 }
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	516
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	517 return;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	518 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	519
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	520 /* 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	521
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2233 diff changeset	522 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
1456 698ea64f71e1 fix unlikely socket leak Igor Sysoev <igor@sysoev.ru> parents: 1455 diff changeset	523 c->error = 1;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	524 ngx_http_finalize_request(r, rc);
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	525 return;
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	526 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	527
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	528 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	529
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	530 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	531
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	532 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	533
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	534 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	535 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	536 }
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	537
fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	538 ngx_add_timer(rev, timer);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	539 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	540 }
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	541
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	542
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	543 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	544 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	545 {
663 6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	546 size_t size;
6d5c1535bb9d nginx-0.3.53-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 637 diff changeset	547 ssize_t n;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	548 u_char buffer[NGX_HTTP_DISCARD_BUFFER_SIZE];
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	549
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	550 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	551 "http read discarded body");
f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	552
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	553 do {
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	554 if (r->headers_in.content_length_n == 0) {
1369 6254b90eea4b block reading for level events Igor Sysoev <igor@sysoev.ru> parents: 1367 diff changeset	555 r->read_event_handler = ngx_http_block_reading;
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	556 return NGX_OK;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	557 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	558
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	559 size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	560 NGX_HTTP_DISCARD_BUFFER_SIZE:
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	561 (size_t) r->headers_in.content_length_n;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	562
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	563 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	564
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	565 if (n == NGX_ERROR) {
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	566 r->connection->error = 1;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	567 return NGX_OK;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	568 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	569
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	570 if (n == NGX_AGAIN) {
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	571 return NGX_AGAIN;
aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	572 }
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	573
1422 65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	574 if (n == 0) {
65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	575 return NGX_OK;
65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	576 }
65dd057f71c7 cancel discarding body on EOF Igor Sysoev <igor@sysoev.ru> parents: 1373 diff changeset	577
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	578 r->headers_in.content_length_n -= n;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	579
1367 aa700583b57d discard request body in cycle Igor Sysoev <igor@sysoev.ru> parents: 1290 diff changeset	580 } while (r->connection->read->ready);
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	581
1373 fdea12ffb24a discard request body before going to keep-alive state and use lingering timeouts Igor Sysoev <igor@sysoev.ru> parents: 1370 diff changeset	582 return NGX_AGAIN;
633 f971949ffb58 nginx-0.3.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	583 }

Mercurial > hg > nginx

annotate src/http/ngx_http_request_body.c @ 2388:722b5aff05ae