annotate src/http/ngx_http_request_body.c @ 672:f41d4b305d22 NGINX_1_2_0

nginx 1.2.0 *) Bugfix: a segmentation fault might occur in a worker process if the "try_files" directive was used; the bug had appeared in 1.1.19. *) Bugfix: response might be truncated if there were more than IOV_MAX buffers used. *) Bugfix: in the "crop" parameter of the "image_filter" directive. Thanks to Maxim Bublis.
author Igor Sysoev <http://sysoev.ru>
date Mon, 23 Apr 2012 00:00:00 +0400
parents d0f7a625f27c
children 6db6e93f55ee
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 /*
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3 * Copyright (C) Igor Sysoev
660
d0f7a625f27c nginx 1.1.14
Igor Sysoev <http://sysoev.ru>
parents: 636
diff changeset
4 * Copyright (C) Nginx, Inc.
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5 */
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 #include <ngx_config.h>
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 #include <ngx_core.h>
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10 #include <ngx_http.h>
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
13 static void ngx_http_read_client_request_body_handler(ngx_http_request_t *r);
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
14 static ngx_int_t ngx_http_do_read_client_request_body(ngx_http_request_t *r);
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
15 static ngx_int_t ngx_http_write_request_body(ngx_http_request_t *r,
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
16 ngx_chain_t *body);
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
17 static ngx_int_t ngx_http_read_discarded_request_body(ngx_http_request_t *r);
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
18 static ngx_int_t ngx_http_test_expect(ngx_http_request_t *r);
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
19
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
21 /*
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
22 * on completion ngx_http_read_client_request_body() adds to
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
23 * r->request_body->bufs one or two bufs:
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
24 * *) one memory buf that was preread in r->header_in;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
25 * *) one memory or file buf that contains the rest of the body
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
26 */
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
27
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
28 ngx_int_t
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
29 ngx_http_read_client_request_body(ngx_http_request_t *r,
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
30 ngx_http_client_body_handler_pt post_handler)
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 {
212
56688ed172c8 nginx 0.3.53
Igor Sysoev <http://sysoev.ru>
parents: 186
diff changeset
32 size_t preread;
56688ed172c8 nginx 0.3.53
Igor Sysoev <http://sysoev.ru>
parents: 186
diff changeset
33 ssize_t size;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34 ngx_buf_t *b;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
35 ngx_chain_t *cl, **next;
238
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
36 ngx_temp_file_t *tf;
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
37 ngx_http_request_body_t *rb;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38 ngx_http_core_loc_conf_t *clcf;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39
518
86dad910eeb6 nginx 0.8.11
Igor Sysoev <http://sysoev.ru>
parents: 438
diff changeset
40 r->main->count++;
86dad910eeb6 nginx 0.8.11
Igor Sysoev <http://sysoev.ru>
parents: 438
diff changeset
41
86
962c43960644 nginx 0.1.43
Igor Sysoev <http://sysoev.ru>
parents: 76
diff changeset
42 if (r->request_body || r->discard_body) {
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
43 post_handler(r);
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
44 return NGX_OK;
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
45 }
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
46
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
47 if (ngx_http_test_expect(r) != NGX_OK) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
48 return NGX_HTTP_INTERNAL_SERVER_ERROR;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
49 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
50
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
51 rb = ngx_pcalloc(r->pool, sizeof(ngx_http_request_body_t));
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
52 if (rb == NULL) {
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
53 return NGX_HTTP_INTERNAL_SERVER_ERROR;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
54 }
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
55
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
56 r->request_body = rb;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
57
238
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
58 if (r->headers_in.content_length_n < 0) {
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
59 post_handler(r);
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
60 return NGX_OK;
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
61 }
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
62
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
63 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
64
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
65 if (r->headers_in.content_length_n == 0) {
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
66
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
67 if (r->request_body_in_file_only) {
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
68 tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
69 if (tf == NULL) {
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
70 return NGX_HTTP_INTERNAL_SERVER_ERROR;
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
71 }
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
72
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
73 tf->file.fd = NGX_INVALID_FILE;
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
74 tf->file.log = r->connection->log;
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
75 tf->path = clcf->client_body_temp_path;
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
76 tf->pool = r->pool;
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
77 tf->warn = "a client request body is buffered to a temporary file";
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
78 tf->log_level = r->request_body_file_log_level;
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
79 tf->persistent = r->request_body_in_persistent_file;
278
704622b2528a nginx 0.5.9
Igor Sysoev <http://sysoev.ru>
parents: 276
diff changeset
80 tf->clean = r->request_body_in_clean_file;
238
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
81
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
82 if (r->request_body_file_group_access) {
276
c5c2b2883984 nginx 0.5.8
Igor Sysoev <http://sysoev.ru>
parents: 256
diff changeset
83 tf->access = 0660;
238
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
84 }
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
85
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
86 rb->temp_file = tf;
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
87
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
88 if (ngx_create_temp_file(&tf->file, tf->path, tf->pool,
278
704622b2528a nginx 0.5.9
Igor Sysoev <http://sysoev.ru>
parents: 276
diff changeset
89 tf->persistent, tf->clean, tf->access)
238
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
90 != NGX_OK)
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
91 {
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
92 return NGX_HTTP_INTERNAL_SERVER_ERROR;
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
93 }
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
94 }
a528ae0fe909 nginx 0.4.4
Igor Sysoev <http://sysoev.ru>
parents: 230
diff changeset
95
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
96 post_handler(r);
318
fc223117327f nginx 0.6.3
Igor Sysoev <http://sysoev.ru>
parents: 286
diff changeset
97
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
98 return NGX_OK;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
99 }
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
100
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
101 rb->post_handler = post_handler;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
102
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
103 /*
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
104 * set by ngx_pcalloc():
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
105 *
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
106 * rb->bufs = NULL;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
107 * rb->buf = NULL;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
108 * rb->rest = 0;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
109 */
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
110
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
111 preread = r->header_in->last - r->header_in->pos;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
112
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
113 if (preread) {
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
114
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
115 /* there is the pre-read part of the request body */
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
116
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
117 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
118 "http client request body preread %uz", preread);
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
119
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
120 b = ngx_calloc_buf(r->pool);
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
121 if (b == NULL) {
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
122 return NGX_HTTP_INTERNAL_SERVER_ERROR;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
123 }
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
124
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
125 b->temporary = 1;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
126 b->start = r->header_in->pos;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
127 b->pos = r->header_in->pos;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
128 b->last = r->header_in->last;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
129 b->end = r->header_in->end;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
130
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
131 rb->bufs = ngx_alloc_chain_link(r->pool);
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
132 if (rb->bufs == NULL) {
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
133 return NGX_HTTP_INTERNAL_SERVER_ERROR;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
134 }
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
135
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
136 rb->bufs->buf = b;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
137 rb->bufs->next = NULL;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
138
216
fa32d59d9a15 nginx 0.3.55
Igor Sysoev <http://sysoev.ru>
parents: 214
diff changeset
139 rb->buf = b;
fa32d59d9a15 nginx 0.3.55
Igor Sysoev <http://sysoev.ru>
parents: 214
diff changeset
140
214
0ad9eeb6ac7f nginx 0.3.54
Igor Sysoev <http://sysoev.ru>
parents: 212
diff changeset
141 if ((off_t) preread >= r->headers_in.content_length_n) {
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
142
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
143 /* the whole request body was pre-read */
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
144
212
56688ed172c8 nginx 0.3.53
Igor Sysoev <http://sysoev.ru>
parents: 186
diff changeset
145 r->header_in->pos += (size_t) r->headers_in.content_length_n;
24
420dd3f9e703 nginx 0.1.12
Igor Sysoev <http://sysoev.ru>
parents: 10
diff changeset
146 r->request_length += r->headers_in.content_length_n;
634
23ef0645ea57 nginx 1.1.1
Igor Sysoev <http://sysoev.ru>
parents: 538
diff changeset
147 b->last = r->header_in->pos;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
148
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
149 if (r->request_body_in_file_only) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
150 if (ngx_http_write_request_body(r, rb->bufs) != NGX_OK) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
151 return NGX_HTTP_INTERNAL_SERVER_ERROR;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
152 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
153 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
154
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
155 post_handler(r);
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
156
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
157 return NGX_OK;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
158 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
159
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
160 /*
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
161 * to not consider the body as pipelined request in
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
162 * ngx_http_set_keepalive()
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
163 */
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
164 r->header_in->pos = r->header_in->last;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
165
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
166 r->request_length += preread;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
167
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
168 rb->rest = r->headers_in.content_length_n - preread;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
169
214
0ad9eeb6ac7f nginx 0.3.54
Igor Sysoev <http://sysoev.ru>
parents: 212
diff changeset
170 if (rb->rest <= (off_t) (b->end - b->last)) {
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
171
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
172 /* the whole request body may be placed in r->header_in */
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
173
276
c5c2b2883984 nginx 0.5.8
Igor Sysoev <http://sysoev.ru>
parents: 256
diff changeset
174 rb->to_write = rb->bufs;
c5c2b2883984 nginx 0.5.8
Igor Sysoev <http://sysoev.ru>
parents: 256
diff changeset
175
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
176 r->read_event_handler = ngx_http_read_client_request_body_handler;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
177
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
178 return ngx_http_do_read_client_request_body(r);
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
179 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
180
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
181 next = &rb->bufs->next;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
183 } else {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
184 b = NULL;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
185 rb->rest = r->headers_in.content_length_n;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
186 next = &rb->bufs;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
187 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
188
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
189 size = clcf->client_body_buffer_size;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
190 size += size >> 2;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
191
212
56688ed172c8 nginx 0.3.53
Igor Sysoev <http://sysoev.ru>
parents: 186
diff changeset
192 if (rb->rest < size) {
56688ed172c8 nginx 0.3.53
Igor Sysoev <http://sysoev.ru>
parents: 186
diff changeset
193 size = (ssize_t) rb->rest;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
194
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
195 if (r->request_body_in_single_buf) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
196 size += preread;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
197 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
198
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
199 } else {
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
200 size = clcf->client_body_buffer_size;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
201
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
202 /* disable copying buffer for r->request_body_in_single_buf */
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
203 b = NULL;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
204 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
205
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
206 rb->buf = ngx_create_temp_buf(r->pool, size);
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
207 if (rb->buf == NULL) {
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
208 return NGX_HTTP_INTERNAL_SERVER_ERROR;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
209 }
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
210
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
211 cl = ngx_alloc_chain_link(r->pool);
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
212 if (cl == NULL) {
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
213 return NGX_HTTP_INTERNAL_SERVER_ERROR;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
214 }
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
215
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
216 cl->buf = rb->buf;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
217 cl->next = NULL;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
218
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
219 if (b && r->request_body_in_single_buf) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
220 size = b->last - b->pos;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
221 ngx_memcpy(rb->buf->pos, b->pos, size);
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
222 rb->buf->last += size;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
223
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
224 next = &rb->bufs;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
225 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
226
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
227 *next = cl;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
228
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
229 if (r->request_body_in_file_only || r->request_body_in_single_buf) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
230 rb->to_write = rb->bufs;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
231
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
232 } else {
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
233 rb->to_write = rb->bufs->next ? rb->bufs->next : rb->bufs;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
234 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
235
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
236 r->read_event_handler = ngx_http_read_client_request_body_handler;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
237
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
238 return ngx_http_do_read_client_request_body(r);
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
239 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
240
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
241
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
242 static void
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
243 ngx_http_read_client_request_body_handler(ngx_http_request_t *r)
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
244 {
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
245 ngx_int_t rc;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
246
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
247 if (r->connection->read->timedout) {
126
df17fbafec8f nginx 0.3.10
Igor Sysoev <http://sysoev.ru>
parents: 122
diff changeset
248 r->connection->timedout = 1;
278
704622b2528a nginx 0.5.9
Igor Sysoev <http://sysoev.ru>
parents: 276
diff changeset
249 ngx_http_finalize_request(r, NGX_HTTP_REQUEST_TIME_OUT);
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
250 return;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
251 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
252
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
253 rc = ngx_http_do_read_client_request_body(r);
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
254
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
255 if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
278
704622b2528a nginx 0.5.9
Igor Sysoev <http://sysoev.ru>
parents: 276
diff changeset
256 ngx_http_finalize_request(r, rc);
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
257 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
258 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
259
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
260
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
261 static ngx_int_t
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
262 ngx_http_do_read_client_request_body(ngx_http_request_t *r)
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
263 {
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
264 size_t size;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
265 ssize_t n;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
266 ngx_buf_t *b;
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
267 ngx_connection_t *c;
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
268 ngx_http_request_body_t *rb;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
269 ngx_http_core_loc_conf_t *clcf;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
270
58
b55cbf18157e nginx 0.1.29
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
271 c = r->connection;
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
272 rb = r->request_body;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
273
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
274 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
275 "http read client request body");
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
276
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
277 for ( ;; ) {
256
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
278 for ( ;; ) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
279 if (rb->buf->last == rb->buf->end) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
280
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
281 if (ngx_http_write_request_body(r, rb->to_write) != NGX_OK) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
282 return NGX_HTTP_INTERNAL_SERVER_ERROR;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
283 }
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
284
256
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
285 rb->to_write = rb->bufs->next ? rb->bufs->next : rb->bufs;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
286 rb->buf->last = rb->buf->start;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
287 }
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
288
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
289 size = rb->buf->end - rb->buf->last;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
290
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
291 if ((off_t) size > rb->rest) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
292 size = (size_t) rb->rest;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
293 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
294
256
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
295 n = c->recv(c, rb->buf->last, size);
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
296
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
297 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
298 "http client request body recv %z", n);
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
299
256
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
300 if (n == NGX_AGAIN) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
301 break;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
302 }
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
303
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
304 if (n == 0) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
305 ngx_log_error(NGX_LOG_INFO, c->log, 0,
672
f41d4b305d22 nginx 1.2.0
Igor Sysoev <http://sysoev.ru>
parents: 660
diff changeset
306 "client prematurely closed connection");
256
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
307 }
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
308
256
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
309 if (n == 0 || n == NGX_ERROR) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
310 c->error = 1;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
311 return NGX_HTTP_BAD_REQUEST;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
312 }
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
313
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
314 rb->buf->last += n;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
315 rb->rest -= n;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
316 r->request_length += n;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
317
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
318 if (rb->rest == 0) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
319 break;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
320 }
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
321
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
322 if (rb->buf->last < rb->buf->end) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
323 break;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
324 }
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
325 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
326
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
327 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
286
5bef04fc3fd5 nginx 0.5.13
Igor Sysoev <http://sysoev.ru>
parents: 278
diff changeset
328 "http client request body rest %O", rb->rest);
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
329
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
330 if (rb->rest == 0) {
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
331 break;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
332 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
333
256
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
334 if (!c->read->ready) {
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
335 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
336 ngx_add_timer(c->read, clcf->client_body_timeout);
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
337
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 406
diff changeset
338 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
256
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
339 return NGX_HTTP_INTERNAL_SERVER_ERROR;
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
340 }
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 86
diff changeset
341
256
2e9c57a5e50a nginx 0.4.13
Igor Sysoev <http://sysoev.ru>
parents: 238
diff changeset
342 return NGX_AGAIN;
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 86
diff changeset
343 }
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
344 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
345
122
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 86
diff changeset
346 if (c->read->timer_set) {
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 86
diff changeset
347 ngx_del_timer(c->read);
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 86
diff changeset
348 }
d25a1d6034f1 nginx 0.3.8
Igor Sysoev <http://sysoev.ru>
parents: 86
diff changeset
349
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
350 if (rb->temp_file || r->request_body_in_file_only) {
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
351
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
352 /* save the last part */
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
353
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
354 if (ngx_http_write_request_body(r, rb->to_write) != NGX_OK) {
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
355 return NGX_HTTP_INTERNAL_SERVER_ERROR;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
356 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
357
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
358 b = ngx_calloc_buf(r->pool);
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 28
diff changeset
359 if (b == NULL) {
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
360 return NGX_HTTP_INTERNAL_SERVER_ERROR;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
361 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
362
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
363 b->in_file = 1;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
364 b->file_pos = 0;
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
365 b->file_last = rb->temp_file->file.offset;
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
366 b->file = &rb->temp_file->file;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
367
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
368 if (rb->bufs->next) {
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
369 rb->bufs->next->buf = b;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
370
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
371 } else {
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
372 rb->bufs->buf = b;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
373 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
374 }
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
375
634
23ef0645ea57 nginx 1.1.1
Igor Sysoev <http://sysoev.ru>
parents: 538
diff changeset
376 if (rb->bufs->next
23ef0645ea57 nginx 1.1.1
Igor Sysoev <http://sysoev.ru>
parents: 538
diff changeset
377 && (r->request_body_in_file_only || r->request_body_in_single_buf))
23ef0645ea57 nginx 1.1.1
Igor Sysoev <http://sysoev.ru>
parents: 538
diff changeset
378 {
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
379 rb->bufs = rb->bufs->next;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
380 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
381
636
943566b4d82e nginx 1.1.2
Igor Sysoev <http://sysoev.ru>
parents: 634
diff changeset
382 r->read_event_handler = ngx_http_block_reading;
943566b4d82e nginx 1.1.2
Igor Sysoev <http://sysoev.ru>
parents: 634
diff changeset
383
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 24
diff changeset
384 rb->post_handler(r);
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
385
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
386 return NGX_OK;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
387 }
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
388
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
389
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
390 static ngx_int_t
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
391 ngx_http_write_request_body(ngx_http_request_t *r, ngx_chain_t *body)
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
392 {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
393 ssize_t n;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
394 ngx_temp_file_t *tf;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
395 ngx_http_request_body_t *rb;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
396 ngx_http_core_loc_conf_t *clcf;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
397
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
398 rb = r->request_body;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
399
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
400 if (rb->temp_file == NULL) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
401 tf = ngx_pcalloc(r->pool, sizeof(ngx_temp_file_t));
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
402 if (tf == NULL) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
403 return NGX_ERROR;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
404 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
405
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
406 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
407
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
408 tf->file.fd = NGX_INVALID_FILE;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
409 tf->file.log = r->connection->log;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
410 tf->path = clcf->client_body_temp_path;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
411 tf->pool = r->pool;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
412 tf->warn = "a client request body is buffered to a temporary file";
186
54aabf2b0bc6 nginx 0.3.40
Igor Sysoev <http://sysoev.ru>
parents: 182
diff changeset
413 tf->log_level = r->request_body_file_log_level;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
414 tf->persistent = r->request_body_in_persistent_file;
278
704622b2528a nginx 0.5.9
Igor Sysoev <http://sysoev.ru>
parents: 276
diff changeset
415 tf->clean = r->request_body_in_clean_file;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
416
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
417 if (r->request_body_file_group_access) {
276
c5c2b2883984 nginx 0.5.8
Igor Sysoev <http://sysoev.ru>
parents: 256
diff changeset
418 tf->access = 0660;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
419 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
420
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
421 rb->temp_file = tf;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
422 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
423
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
424 n = ngx_write_chain_to_temp_file(rb->temp_file, body);
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
425
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
426 /* TODO: n == 0 or not complete and level event */
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
427
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
428 if (n == NGX_ERROR) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
429 return NGX_ERROR;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
430 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
431
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
432 rb->temp_file->offset += n;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
433
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
434 return NGX_OK;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
435 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
436
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
437
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
438 ngx_int_t
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
439 ngx_http_discard_request_body(ngx_http_request_t *r)
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
440 {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
441 ssize_t size;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
442 ngx_event_t *rev;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
443
222
dd6c66b5b0e2 nginx 0.3.58
Igor Sysoev <http://sysoev.ru>
parents: 216
diff changeset
444 if (r != r->main || r->discard_body) {
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
445 return NGX_OK;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
446 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
447
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
448 if (ngx_http_test_expect(r) != NGX_OK) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
449 return NGX_HTTP_INTERNAL_SERVER_ERROR;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
450 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
451
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
452 rev = r->connection->read;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
453
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
454 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, rev->log, 0, "http set discard body");
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
455
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
456 if (rev->timer_set) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
457 ngx_del_timer(rev);
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
458 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
459
342
4276c2f1f434 nginx 0.6.15
Igor Sysoev <http://sysoev.ru>
parents: 332
diff changeset
460 if (r->headers_in.content_length_n <= 0 || r->request_body) {
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
461 return NGX_OK;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
462 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
463
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
464 size = r->header_in->last - r->header_in->pos;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
465
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
466 if (size) {
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
467 if (r->headers_in.content_length_n > size) {
538
1dcf6adad484 nginx 0.8.21
Igor Sysoev <http://sysoev.ru>
parents: 532
diff changeset
468 r->header_in->pos += size;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
469 r->headers_in.content_length_n -= size;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
470
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
471 } else {
212
56688ed172c8 nginx 0.3.53
Igor Sysoev <http://sysoev.ru>
parents: 186
diff changeset
472 r->header_in->pos += (size_t) r->headers_in.content_length_n;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
473 r->headers_in.content_length_n = 0;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
474 return NGX_OK;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
475 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
476 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
477
538
1dcf6adad484 nginx 0.8.21
Igor Sysoev <http://sysoev.ru>
parents: 532
diff changeset
478 r->read_event_handler = ngx_http_discarded_request_body_handler;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
479
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 406
diff changeset
480 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
481 return NGX_HTTP_INTERNAL_SERVER_ERROR;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
482 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
483
532
f7ec98e3caeb nginx 0.8.18
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
484 if (ngx_http_read_discarded_request_body(r) == NGX_OK) {
f7ec98e3caeb nginx 0.8.18
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
485 r->lingering_close = 0;
f7ec98e3caeb nginx 0.8.18
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
486
f7ec98e3caeb nginx 0.8.18
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
487 } else {
530
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 524
diff changeset
488 r->count++;
532
f7ec98e3caeb nginx 0.8.18
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
489 r->discard_body = 1;
530
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 524
diff changeset
490 }
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
491
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
492 return NGX_OK;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
493 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
494
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
495
538
1dcf6adad484 nginx 0.8.21
Igor Sysoev <http://sysoev.ru>
parents: 532
diff changeset
496 void
1dcf6adad484 nginx 0.8.21
Igor Sysoev <http://sysoev.ru>
parents: 532
diff changeset
497 ngx_http_discarded_request_body_handler(ngx_http_request_t *r)
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
498 {
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
499 ngx_int_t rc;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
500 ngx_msec_t timer;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
501 ngx_event_t *rev;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
502 ngx_connection_t *c;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
503 ngx_http_core_loc_conf_t *clcf;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
504
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
505 c = r->connection;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
506 rev = c->read;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
507
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
508 if (rev->timedout) {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
509 c->timedout = 1;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
510 c->error = 1;
538
1dcf6adad484 nginx 0.8.21
Igor Sysoev <http://sysoev.ru>
parents: 532
diff changeset
511 ngx_http_finalize_request(r, NGX_ERROR);
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
512 return;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
513 }
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
514
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
515 if (r->lingering_time) {
346
05693816539c nginx 0.6.17
Igor Sysoev <http://sysoev.ru>
parents: 342
diff changeset
516 timer = (ngx_msec_t) (r->lingering_time - ngx_time());
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
517
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
518 if (timer <= 0) {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
519 r->discard_body = 0;
532
f7ec98e3caeb nginx 0.8.18
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
520 r->lingering_close = 0;
538
1dcf6adad484 nginx 0.8.21
Igor Sysoev <http://sysoev.ru>
parents: 532
diff changeset
521 ngx_http_finalize_request(r, NGX_ERROR);
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
522 return;
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
523 }
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
524
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
525 } else {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
526 timer = 0;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
527 }
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
528
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
529 rc = ngx_http_read_discarded_request_body(r);
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
530
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
531 if (rc == NGX_OK) {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
532 r->discard_body = 0;
532
f7ec98e3caeb nginx 0.8.18
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
533 r->lingering_close = 0;
538
1dcf6adad484 nginx 0.8.21
Igor Sysoev <http://sysoev.ru>
parents: 532
diff changeset
534 ngx_http_finalize_request(r, NGX_DONE);
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
535 return;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
536 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
537
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
538 /* rc == NGX_AGAIN */
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
539
430
dac47e9ef0d5 nginx 0.7.27
Igor Sysoev <http://sysoev.ru>
parents: 406
diff changeset
540 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
332
3a91bfeffaba nginx 0.6.10
Igor Sysoev <http://sysoev.ru>
parents: 330
diff changeset
541 c->error = 1;
538
1dcf6adad484 nginx 0.8.21
Igor Sysoev <http://sysoev.ru>
parents: 532
diff changeset
542 ngx_http_finalize_request(r, NGX_ERROR);
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
543 return;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
544 }
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
545
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
546 if (timer) {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
547
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
548 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
549
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
550 timer *= 1000;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
551
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
552 if (timer > clcf->lingering_timeout) {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
553 timer = clcf->lingering_timeout;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
554 }
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
555
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
556 ngx_add_timer(rev, timer);
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
557 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
558 }
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
559
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
560
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
561 static ngx_int_t
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
562 ngx_http_read_discarded_request_body(ngx_http_request_t *r)
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
563 {
212
56688ed172c8 nginx 0.3.53
Igor Sysoev <http://sysoev.ru>
parents: 186
diff changeset
564 size_t size;
56688ed172c8 nginx 0.3.53
Igor Sysoev <http://sysoev.ru>
parents: 186
diff changeset
565 ssize_t n;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
566 u_char buffer[NGX_HTTP_DISCARD_BUFFER_SIZE];
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
567
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
568 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
569 "http read discarded body");
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
570
530
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 524
diff changeset
571 for ( ;; ) {
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
572 if (r->headers_in.content_length_n == 0) {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
573 r->read_event_handler = ngx_http_block_reading;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
574 return NGX_OK;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
575 }
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
576
530
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 524
diff changeset
577 if (!r->connection->read->ready) {
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 524
diff changeset
578 return NGX_AGAIN;
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 524
diff changeset
579 }
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 524
diff changeset
580
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
581 size = (r->headers_in.content_length_n > NGX_HTTP_DISCARD_BUFFER_SIZE) ?
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
582 NGX_HTTP_DISCARD_BUFFER_SIZE:
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
583 (size_t) r->headers_in.content_length_n;
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
584
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
585 n = r->connection->recv(r->connection, buffer, size);
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
586
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
587 if (n == NGX_ERROR) {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
588 r->connection->error = 1;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
589 return NGX_OK;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
590 }
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
591
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
592 if (n == NGX_AGAIN) {
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
593 return NGX_AGAIN;
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
594 }
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
595
330
5e3b425174f6 nginx 0.6.9
Igor Sysoev <http://sysoev.ru>
parents: 326
diff changeset
596 if (n == 0) {
5e3b425174f6 nginx 0.6.9
Igor Sysoev <http://sysoev.ru>
parents: 326
diff changeset
597 return NGX_OK;
5e3b425174f6 nginx 0.6.9
Igor Sysoev <http://sysoev.ru>
parents: 326
diff changeset
598 }
5e3b425174f6 nginx 0.6.9
Igor Sysoev <http://sysoev.ru>
parents: 326
diff changeset
599
326
9fc4ab6673f9 nginx 0.6.7
Igor Sysoev <http://sysoev.ru>
parents: 318
diff changeset
600 r->headers_in.content_length_n -= n;
530
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 524
diff changeset
601 }
182
13710a1813ad nginx 0.3.38
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
602 }
438
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
603
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
604
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
605 static ngx_int_t
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
606 ngx_http_test_expect(ngx_http_request_t *r)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
607 {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
608 ngx_int_t n;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
609 ngx_str_t *expect;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
610
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
611 if (r->expect_tested
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
612 || r->headers_in.expect == NULL
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
613 || r->http_version < NGX_HTTP_VERSION_11)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
614 {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
615 return NGX_OK;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
616 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
617
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
618 r->expect_tested = 1;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
619
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
620 expect = &r->headers_in.expect->value;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
621
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
622 if (expect->len != sizeof("100-continue") - 1
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
623 || ngx_strncasecmp(expect->data, (u_char *) "100-continue",
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
624 sizeof("100-continue") - 1)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
625 != 0)
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
626 {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
627 return NGX_OK;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
628 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
629
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
630 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
631 "send 100 Continue");
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
632
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
633 n = r->connection->send(r->connection,
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
634 (u_char *) "HTTP/1.1 100 Continue" CRLF CRLF,
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
635 sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1);
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
636
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
637 if (n == sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1) {
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
638 return NGX_OK;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
639 }
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
640
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
641 /* we assume that such small packet should be send successfully */
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
642
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
643 return NGX_ERROR;
ce4f9ff90bfa nginx 0.7.31
Igor Sysoev <http://sysoev.ru>
parents: 430
diff changeset
644 }