Mercurial > hg > nginx-quic
annotate src/http/modules/ngx_http_memcached_module.c @ 3516:dd1570b6f237
ngx_str_set() and ngx_str_null()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 14 May 2010 09:56:37 +0000 |
parents | 5d2acf153153 |
children | 66a244ee8cf7 |
rev | line source |
---|---|
581 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 #include <ngx_http.h> | |
10 | |
11 | |
12 typedef struct { | |
13 ngx_http_upstream_conf_t upstream; | |
1076 | 14 ngx_int_t index; |
581 | 15 } ngx_http_memcached_loc_conf_t; |
16 | |
17 | |
18 typedef struct { | |
19 size_t rest; | |
20 ngx_http_request_t *request; | |
597 | 21 ngx_str_t key; |
581 | 22 } ngx_http_memcached_ctx_t; |
23 | |
24 | |
25 static ngx_int_t ngx_http_memcached_create_request(ngx_http_request_t *r); | |
26 static ngx_int_t ngx_http_memcached_reinit_request(ngx_http_request_t *r); | |
27 static ngx_int_t ngx_http_memcached_process_header(ngx_http_request_t *r); | |
28 static ngx_int_t ngx_http_memcached_filter_init(void *data); | |
29 static ngx_int_t ngx_http_memcached_filter(void *data, ssize_t bytes); | |
30 static void ngx_http_memcached_abort_request(ngx_http_request_t *r); | |
31 static void ngx_http_memcached_finalize_request(ngx_http_request_t *r, | |
32 ngx_int_t rc); | |
33 | |
34 static void *ngx_http_memcached_create_loc_conf(ngx_conf_t *cf); | |
35 static char *ngx_http_memcached_merge_loc_conf(ngx_conf_t *cf, | |
36 void *parent, void *child); | |
37 | |
38 static char *ngx_http_memcached_pass(ngx_conf_t *cf, ngx_command_t *cmd, | |
39 void *conf); | |
40 | |
884 | 41 static char *ngx_http_memcached_upstream_max_fails_unsupported(ngx_conf_t *cf, |
42 ngx_command_t *cmd, void *conf); | |
43 static char *ngx_http_memcached_upstream_fail_timeout_unsupported(ngx_conf_t *cf, | |
44 ngx_command_t *cmd, void *conf); | |
45 | |
581 | 46 |
47 static ngx_conf_bitmask_t ngx_http_memcached_next_upstream_masks[] = { | |
48 { ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR }, | |
49 { ngx_string("timeout"), NGX_HTTP_UPSTREAM_FT_TIMEOUT }, | |
50 { ngx_string("invalid_response"), NGX_HTTP_UPSTREAM_FT_INVALID_HEADER }, | |
51 { ngx_string("not_found"), NGX_HTTP_UPSTREAM_FT_HTTP_404 }, | |
665 | 52 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, |
581 | 53 { ngx_null_string, 0 } |
54 }; | |
55 | |
56 | |
57 static ngx_command_t ngx_http_memcached_commands[] = { | |
58 | |
59 { ngx_string("memcached_pass"), | |
1788
f10228d7ea06
allow memached_pass inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1787
diff
changeset
|
60 NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1, |
581 | 61 ngx_http_memcached_pass, |
62 NGX_HTTP_LOC_CONF_OFFSET, | |
63 0, | |
64 NULL }, | |
65 | |
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3061
diff
changeset
|
66 { ngx_string("memcached_bind"), |
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3061
diff
changeset
|
67 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
3399 | 68 ngx_http_upstream_bind_set_slot, |
3271
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3061
diff
changeset
|
69 NGX_HTTP_LOC_CONF_OFFSET, |
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3061
diff
changeset
|
70 offsetof(ngx_http_memcached_loc_conf_t, upstream.local), |
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3061
diff
changeset
|
71 NULL }, |
fcd98af88df3
proxy_bind, fastcgi_bind, and memcached_bind
Igor Sysoev <igor@sysoev.ru>
parents:
3061
diff
changeset
|
72 |
581 | 73 { ngx_string("memcached_connect_timeout"), |
74 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
75 ngx_conf_set_msec_slot, | |
76 NGX_HTTP_LOC_CONF_OFFSET, | |
77 offsetof(ngx_http_memcached_loc_conf_t, upstream.connect_timeout), | |
78 NULL }, | |
79 | |
80 { ngx_string("memcached_send_timeout"), | |
81 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
82 ngx_conf_set_msec_slot, | |
83 NGX_HTTP_LOC_CONF_OFFSET, | |
84 offsetof(ngx_http_memcached_loc_conf_t, upstream.send_timeout), | |
85 NULL }, | |
86 | |
87 { ngx_string("memcached_buffer_size"), | |
88 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
89 ngx_conf_set_size_slot, | |
90 NGX_HTTP_LOC_CONF_OFFSET, | |
91 offsetof(ngx_http_memcached_loc_conf_t, upstream.buffer_size), | |
92 NULL }, | |
93 | |
94 { ngx_string("memcached_read_timeout"), | |
95 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
96 ngx_conf_set_msec_slot, | |
97 NGX_HTTP_LOC_CONF_OFFSET, | |
98 offsetof(ngx_http_memcached_loc_conf_t, upstream.read_timeout), | |
99 NULL }, | |
100 | |
101 { ngx_string("memcached_next_upstream"), | |
102 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, | |
103 ngx_conf_set_bitmask_slot, | |
104 NGX_HTTP_LOC_CONF_OFFSET, | |
105 offsetof(ngx_http_memcached_loc_conf_t, upstream.next_upstream), | |
106 &ngx_http_memcached_next_upstream_masks }, | |
107 | |
108 { ngx_string("memcached_upstream_max_fails"), | |
109 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
884 | 110 ngx_http_memcached_upstream_max_fails_unsupported, |
111 0, | |
112 0, | |
581 | 113 NULL }, |
114 | |
115 { ngx_string("memcached_upstream_fail_timeout"), | |
116 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | |
884 | 117 ngx_http_memcached_upstream_fail_timeout_unsupported, |
118 0, | |
119 0, | |
581 | 120 NULL }, |
121 | |
122 ngx_null_command | |
123 }; | |
124 | |
125 | |
667 | 126 static ngx_http_module_t ngx_http_memcached_module_ctx = { |
581 | 127 NULL, /* preconfiguration */ |
128 NULL, /* postconfiguration */ | |
129 | |
130 NULL, /* create main configuration */ | |
131 NULL, /* init main configuration */ | |
132 | |
133 NULL, /* create server configuration */ | |
134 NULL, /* merge server configuration */ | |
135 | |
136 ngx_http_memcached_create_loc_conf, /* create location configration */ | |
137 ngx_http_memcached_merge_loc_conf /* merge location configration */ | |
138 }; | |
139 | |
140 | |
141 ngx_module_t ngx_http_memcached_module = { | |
142 NGX_MODULE_V1, | |
143 &ngx_http_memcached_module_ctx, /* module context */ | |
144 ngx_http_memcached_commands, /* module directives */ | |
145 NGX_HTTP_MODULE, /* module type */ | |
146 NULL, /* init master */ | |
147 NULL, /* init module */ | |
148 NULL, /* init process */ | |
149 NULL, /* init thread */ | |
150 NULL, /* exit thread */ | |
151 NULL, /* exit process */ | |
152 NULL, /* exit master */ | |
153 NGX_MODULE_V1_PADDING | |
154 }; | |
155 | |
156 | |
1076 | 157 static ngx_str_t ngx_http_memcached_key = ngx_string("memcached_key"); |
158 | |
159 | |
581 | 160 #define NGX_HTTP_MEMCACHED_END (sizeof(ngx_http_memcached_end) - 1) |
161 static u_char ngx_http_memcached_end[] = CRLF "END" CRLF; | |
162 | |
163 | |
164 static ngx_int_t | |
165 ngx_http_memcached_handler(ngx_http_request_t *r) | |
166 { | |
167 ngx_int_t rc; | |
168 ngx_http_upstream_t *u; | |
169 ngx_http_memcached_ctx_t *ctx; | |
170 ngx_http_memcached_loc_conf_t *mlcf; | |
171 | |
645 | 172 if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) { |
581 | 173 return NGX_HTTP_NOT_ALLOWED; |
174 } | |
175 | |
1370
cc114c85be0f
rename ngx_http_discard_body() to ngx_http_discard_request_body()
Igor Sysoev <igor@sysoev.ru>
parents:
1333
diff
changeset
|
176 rc = ngx_http_discard_request_body(r); |
581 | 177 |
1374 | 178 if (rc != NGX_OK) { |
581 | 179 return rc; |
180 } | |
181 | |
182 if (ngx_http_set_content_type(r) != NGX_OK) { | |
183 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
184 } | |
185 | |
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
186 if (ngx_http_upstream_create(r) != NGX_OK) { |
581 | 187 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
188 } | |
189 | |
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
190 u = r->upstream; |
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
191 |
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3487
diff
changeset
|
192 ngx_str_set(&u->schema, "memcached://"); |
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
193 u->output.tag = (ngx_buf_tag_t) &ngx_http_memcached_module; |
581 | 194 |
3006
95972b9e790b
ngx_http_upstream_create() to cleanup the previous upstream after
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
195 mlcf = ngx_http_get_module_loc_conf(r, ngx_http_memcached_module); |
581 | 196 |
197 u->conf = &mlcf->upstream; | |
198 | |
199 u->create_request = ngx_http_memcached_create_request; | |
200 u->reinit_request = ngx_http_memcached_reinit_request; | |
201 u->process_header = ngx_http_memcached_process_header; | |
202 u->abort_request = ngx_http_memcached_abort_request; | |
203 u->finalize_request = ngx_http_memcached_finalize_request; | |
204 | |
205 ctx = ngx_palloc(r->pool, sizeof(ngx_http_memcached_ctx_t)); | |
206 if (ctx == NULL) { | |
207 return NGX_HTTP_INTERNAL_SERVER_ERROR; | |
208 } | |
209 | |
210 ctx->rest = NGX_HTTP_MEMCACHED_END; | |
211 ctx->request = r; | |
212 | |
597 | 213 ngx_http_set_ctx(r, ctx, ngx_http_memcached_module); |
214 | |
581 | 215 u->input_filter_init = ngx_http_memcached_filter_init; |
216 u->input_filter = ngx_http_memcached_filter; | |
217 u->input_filter_ctx = ctx; | |
218 | |
3061
f444f291ed38
fix request counter for memcached, introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
219 r->main->count++; |
f444f291ed38
fix request counter for memcached, introduced in r3050
Igor Sysoev <igor@sysoev.ru>
parents:
3006
diff
changeset
|
220 |
581 | 221 ngx_http_upstream_init(r); |
222 | |
223 return NGX_DONE; | |
224 } | |
225 | |
226 | |
227 static ngx_int_t | |
228 ngx_http_memcached_create_request(ngx_http_request_t *r) | |
229 { | |
1076 | 230 size_t len; |
1333
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
231 uintptr_t escape; |
1076 | 232 ngx_buf_t *b; |
233 ngx_chain_t *cl; | |
234 ngx_http_memcached_ctx_t *ctx; | |
235 ngx_http_variable_value_t *vv; | |
236 ngx_http_memcached_loc_conf_t *mlcf; | |
237 | |
238 mlcf = ngx_http_get_module_loc_conf(r, ngx_http_memcached_module); | |
581 | 239 |
1076 | 240 vv = ngx_http_get_indexed_variable(r, mlcf->index); |
241 | |
242 if (vv == NULL || vv->not_found || vv->len == 0) { | |
243 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
244 "the \"$memcached_key\" variable is not set"); | |
245 return NGX_ERROR; | |
246 } | |
247 | |
1333
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
248 escape = 2 * ngx_escape_uri(NULL, vv->data, vv->len, NGX_ESCAPE_MEMCACHED); |
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
249 |
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
250 len = sizeof("get ") - 1 + vv->len + escape + sizeof(CRLF) - 1; |
581 | 251 |
252 b = ngx_create_temp_buf(r->pool, len); | |
253 if (b == NULL) { | |
254 return NGX_ERROR; | |
255 } | |
256 | |
257 cl = ngx_alloc_chain_link(r->pool); | |
258 if (cl == NULL) { | |
259 return NGX_ERROR; | |
260 } | |
261 | |
262 cl->buf = b; | |
263 cl->next = NULL; | |
264 | |
265 r->upstream->request_bufs = cl; | |
266 | |
267 *b->last++ = 'g'; *b->last++ = 'e'; *b->last++ = 't'; *b->last++ = ' '; | |
268 | |
597 | 269 ctx = ngx_http_get_module_ctx(r, ngx_http_memcached_module); |
270 | |
271 ctx->key.data = b->last; | |
272 | |
1333
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
273 if (escape == 0) { |
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
274 b->last = ngx_copy(b->last, vv->data, vv->len); |
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
275 |
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
276 } else { |
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
277 b->last = (u_char *) ngx_escape_uri(b->last, vv->data, vv->len, |
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
278 NGX_ESCAPE_MEMCACHED); |
07ebeeb55700
escape space, etc in $memcached_key
Igor Sysoev <igor@sysoev.ru>
parents:
1332
diff
changeset
|
279 } |
581 | 280 |
597 | 281 ctx->key.len = b->last - ctx->key.data; |
581 | 282 |
283 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
597 | 284 "http memcached request: \"%V\"", &ctx->key); |
581 | 285 |
1088
2d8e72584534
eliminate the useless space symbol
Igor Sysoev <igor@sysoev.ru>
parents:
1076
diff
changeset
|
286 *b->last++ = CR; *b->last++ = LF; |
581 | 287 |
288 return NGX_OK; | |
289 } | |
290 | |
291 | |
292 static ngx_int_t | |
293 ngx_http_memcached_reinit_request(ngx_http_request_t *r) | |
294 { | |
295 return NGX_OK; | |
296 } | |
297 | |
298 | |
299 static ngx_int_t | |
300 ngx_http_memcached_process_header(ngx_http_request_t *r) | |
301 { | |
597 | 302 u_char *p, *len; |
303 ngx_str_t line; | |
304 ngx_http_upstream_t *u; | |
305 ngx_http_memcached_ctx_t *ctx; | |
581 | 306 |
307 u = r->upstream; | |
308 | |
309 for (p = u->buffer.pos; p < u->buffer.last; p++) { | |
310 if (*p == LF) { | |
311 goto found; | |
312 } | |
313 } | |
314 | |
315 return NGX_AGAIN; | |
316 | |
317 found: | |
318 | |
319 *p = '\0'; | |
320 | |
321 line.len = p - u->buffer.pos - 1; | |
322 line.data = u->buffer.pos; | |
323 | |
324 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
325 "memcached: \"%V\"", &line); | |
326 | |
327 p = u->buffer.pos; | |
328 | |
597 | 329 ctx = ngx_http_get_module_ctx(r, ngx_http_memcached_module); |
330 | |
581 | 331 if (ngx_strncmp(p, "VALUE ", sizeof("VALUE ") - 1) == 0) { |
332 | |
333 p += sizeof("VALUE ") - 1; | |
334 | |
597 | 335 if (ngx_strncmp(p, ctx->key.data, ctx->key.len) != 0) { |
581 | 336 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, |
337 "memcached sent invalid key in response \"%V\" " | |
338 "for key \"%V\"", | |
597 | 339 &line, &ctx->key); |
581 | 340 |
341 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
342 } | |
343 | |
597 | 344 p += ctx->key.len; |
581 | 345 |
346 if (*p++ != ' ') { | |
347 goto no_valid; | |
348 } | |
349 | |
350 /* skip flags */ | |
351 | |
352 while (*p) { | |
353 if (*p++ == ' ') { | |
354 goto length; | |
355 } | |
356 } | |
357 | |
358 goto no_valid; | |
359 | |
360 length: | |
361 | |
362 len = p; | |
363 | |
364 while (*p && *p++ != CR) { /* void */ } | |
365 | |
366 r->headers_out.content_length_n = ngx_atoof(len, p - len - 1); | |
367 if (r->headers_out.content_length_n == -1) { | |
368 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
369 "memcached sent invalid length in response \"%V\" " | |
370 "for key \"%V\"", | |
597 | 371 &line, &ctx->key); |
581 | 372 return NGX_HTTP_UPSTREAM_INVALID_HEADER; |
373 } | |
374 | |
375 u->headers_in.status_n = 200; | |
1567
31d4278d51c0
memcached did not set $upstream_response_time
Igor Sysoev <igor@sysoev.ru>
parents:
1554
diff
changeset
|
376 u->state->status = 200; |
581 | 377 u->buffer.pos = p + 1; |
378 | |
379 return NGX_OK; | |
380 } | |
381 | |
382 if (ngx_strcmp(p, "END\x0d") == 0) { | |
383 ngx_log_error(NGX_LOG_INFO, r->connection->log, 0, | |
597 | 384 "key: \"%V\" was not found by memcached", &ctx->key); |
581 | 385 |
386 u->headers_in.status_n = 404; | |
1567
31d4278d51c0
memcached did not set $upstream_response_time
Igor Sysoev <igor@sysoev.ru>
parents:
1554
diff
changeset
|
387 u->state->status = 404; |
581 | 388 |
389 return NGX_OK; | |
390 } | |
391 | |
392 no_valid: | |
393 | |
394 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
395 "memcached sent invalid response: \"%V\"", &line); | |
396 | |
397 return NGX_HTTP_UPSTREAM_INVALID_HEADER; | |
398 } | |
399 | |
400 | |
401 static ngx_int_t | |
402 ngx_http_memcached_filter_init(void *data) | |
403 { | |
404 ngx_http_memcached_ctx_t *ctx = data; | |
405 | |
406 ngx_http_upstream_t *u; | |
407 | |
408 u = ctx->request->upstream; | |
409 | |
410 u->length += NGX_HTTP_MEMCACHED_END; | |
411 | |
412 return NGX_OK; | |
413 } | |
414 | |
415 | |
416 static ngx_int_t | |
417 ngx_http_memcached_filter(void *data, ssize_t bytes) | |
418 { | |
419 ngx_http_memcached_ctx_t *ctx = data; | |
420 | |
421 u_char *last; | |
422 ngx_buf_t *b; | |
423 ngx_chain_t *cl, **ll; | |
424 ngx_http_upstream_t *u; | |
425 | |
426 u = ctx->request->upstream; | |
427 b = &u->buffer; | |
428 | |
429 if (u->length == ctx->rest) { | |
430 | |
431 if (ngx_strncmp(b->last, | |
1548 | 432 ngx_http_memcached_end + NGX_HTTP_MEMCACHED_END - ctx->rest, |
3487
5d2acf153153
revert partially r1555 and fix the error "memcached sent invalid trailer"
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
433 bytes) |
1548 | 434 != 0) |
581 | 435 { |
436 ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0, | |
437 "memcached sent invalid trailer"); | |
3487
5d2acf153153
revert partially r1555 and fix the error "memcached sent invalid trailer"
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
438 |
5d2acf153153
revert partially r1555 and fix the error "memcached sent invalid trailer"
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
439 u->length = 0; |
5d2acf153153
revert partially r1555 and fix the error "memcached sent invalid trailer"
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
440 ctx->rest = 0; |
5d2acf153153
revert partially r1555 and fix the error "memcached sent invalid trailer"
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
441 |
5d2acf153153
revert partially r1555 and fix the error "memcached sent invalid trailer"
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
442 return NGX_OK; |
581 | 443 } |
444 | |
3487
5d2acf153153
revert partially r1555 and fix the error "memcached sent invalid trailer"
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
445 u->length -= bytes; |
5d2acf153153
revert partially r1555 and fix the error "memcached sent invalid trailer"
Igor Sysoev <igor@sysoev.ru>
parents:
3399
diff
changeset
|
446 ctx->rest -= bytes; |
581 | 447 |
448 return NGX_OK; | |
449 } | |
450 | |
451 for (cl = u->out_bufs, ll = &u->out_bufs; cl; cl = cl->next) { | |
452 ll = &cl->next; | |
453 } | |
454 | |
455 cl = ngx_chain_get_free_buf(ctx->request->pool, &u->free_bufs); | |
456 if (cl == NULL) { | |
457 return NGX_ERROR; | |
458 } | |
459 | |
460 cl->buf->flush = 1; | |
461 cl->buf->memory = 1; | |
462 | |
463 *ll = cl; | |
464 | |
1554
30fcc8478d85
two commits those go together by mistake
Igor Sysoev <igor@sysoev.ru>
parents:
1548
diff
changeset
|
465 last = b->last; |
30fcc8478d85
two commits those go together by mistake
Igor Sysoev <igor@sysoev.ru>
parents:
1548
diff
changeset
|
466 cl->buf->pos = last; |
581 | 467 b->last += bytes; |
468 cl->buf->last = b->last; | |
1908
f2953601ed3c
fix memory leak in long-lived non buffered connections
Igor Sysoev <igor@sysoev.ru>
parents:
1788
diff
changeset
|
469 cl->buf->tag = u->output.tag; |
581 | 470 |
471 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0, | |
472 "memcached filter bytes:%z size:%z length:%z rest:%z", | |
473 bytes, b->last - b->pos, u->length, ctx->rest); | |
474 | |
1554
30fcc8478d85
two commits those go together by mistake
Igor Sysoev <igor@sysoev.ru>
parents:
1548
diff
changeset
|
475 if (bytes <= (ssize_t) (u->length - NGX_HTTP_MEMCACHED_END)) { |
581 | 476 u->length -= bytes; |
477 return NGX_OK; | |
478 } | |
479 | |
1554
30fcc8478d85
two commits those go together by mistake
Igor Sysoev <igor@sysoev.ru>
parents:
1548
diff
changeset
|
480 last += u->length - NGX_HTTP_MEMCACHED_END; |
581 | 481 |
482 if (ngx_strncmp(last, ngx_http_memcached_end, b->last - last) != 0) { | |
483 ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0, | |
484 "memcached sent invalid trailer"); | |
485 } | |
486 | |
1554
30fcc8478d85
two commits those go together by mistake
Igor Sysoev <igor@sysoev.ru>
parents:
1548
diff
changeset
|
487 ctx->rest -= b->last - last; |
581 | 488 b->last = last; |
489 cl->buf->last = last; | |
490 u->length = ctx->rest; | |
491 | |
492 return NGX_OK; | |
493 } | |
494 | |
495 | |
496 static void | |
497 ngx_http_memcached_abort_request(ngx_http_request_t *r) | |
498 { | |
499 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
500 "abort http memcached request"); | |
501 return; | |
502 } | |
503 | |
504 | |
505 static void | |
506 ngx_http_memcached_finalize_request(ngx_http_request_t *r, ngx_int_t rc) | |
507 { | |
508 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
509 "finalize http memcached request"); | |
510 return; | |
511 } | |
512 | |
513 | |
514 static void * | |
515 ngx_http_memcached_create_loc_conf(ngx_conf_t *cf) | |
516 { | |
517 ngx_http_memcached_loc_conf_t *conf; | |
518 | |
519 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_memcached_loc_conf_t)); | |
520 if (conf == NULL) { | |
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2392
diff
changeset
|
521 return NULL; |
581 | 522 } |
523 | |
524 /* | |
525 * set by ngx_pcalloc(): | |
526 * | |
527 * conf->upstream.bufs.num = 0; | |
528 * conf->upstream.next_upstream = 0; | |
529 * conf->upstream.temp_path = NULL; | |
530 * conf->upstream.uri = { 0, NULL }; | |
531 * conf->upstream.location = NULL; | |
532 */ | |
533 | |
534 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; | |
535 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | |
536 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; | |
537 | |
538 conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE; | |
539 | |
884 | 540 /* the hardcoded values */ |
581 | 541 conf->upstream.cyclic_temp_file = 0; |
629 | 542 conf->upstream.buffering = 0; |
543 conf->upstream.ignore_client_abort = 0; | |
581 | 544 conf->upstream.send_lowat = 0; |
545 conf->upstream.bufs.num = 0; | |
546 conf->upstream.busy_buffers_size = 0; | |
547 conf->upstream.max_temp_file_size = 0; | |
548 conf->upstream.temp_file_write_size = 0; | |
657 | 549 conf->upstream.intercept_errors = 1; |
675 | 550 conf->upstream.intercept_404 = 1; |
581 | 551 conf->upstream.pass_request_headers = 0; |
552 conf->upstream.pass_request_body = 0; | |
553 | |
1787
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
554 conf->index = NGX_CONF_UNSET; |
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
555 |
581 | 556 return conf; |
557 } | |
558 | |
559 | |
560 static char * | |
561 ngx_http_memcached_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) | |
562 { | |
563 ngx_http_memcached_loc_conf_t *prev = parent; | |
564 ngx_http_memcached_loc_conf_t *conf = child; | |
565 | |
566 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, | |
567 prev->upstream.connect_timeout, 60000); | |
568 | |
569 ngx_conf_merge_msec_value(conf->upstream.send_timeout, | |
570 prev->upstream.send_timeout, 60000); | |
571 | |
572 ngx_conf_merge_msec_value(conf->upstream.read_timeout, | |
573 prev->upstream.read_timeout, 60000); | |
574 | |
575 ngx_conf_merge_size_value(conf->upstream.buffer_size, | |
576 prev->upstream.buffer_size, | |
577 (size_t) ngx_pagesize); | |
578 | |
579 ngx_conf_merge_bitmask_value(conf->upstream.next_upstream, | |
580 prev->upstream.next_upstream, | |
581 (NGX_CONF_BITMASK_SET | |
582 |NGX_HTTP_UPSTREAM_FT_ERROR | |
583 |NGX_HTTP_UPSTREAM_FT_TIMEOUT)); | |
584 | |
665 | 585 if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) { |
586 conf->upstream.next_upstream = NGX_CONF_BITMASK_SET | |
587 |NGX_HTTP_UPSTREAM_FT_OFF; | |
588 } | |
589 | |
1787
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
590 if (conf->upstream.upstream == NULL) { |
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
591 conf->upstream.upstream = prev->upstream.upstream; |
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
592 } |
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
593 |
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
594 if (conf->index == NGX_CONF_UNSET) { |
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
595 conf->index = prev->index; |
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
596 } |
a37fe5ceacc4
inherit $memached_key index and memcached_pass upstream inside "if" block
Igor Sysoev <igor@sysoev.ru>
parents:
1658
diff
changeset
|
597 |
581 | 598 return NGX_CONF_OK; |
599 } | |
600 | |
601 | |
602 static char * | |
603 ngx_http_memcached_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
604 { | |
2392 | 605 ngx_http_memcached_loc_conf_t *mlcf = conf; |
581 | 606 |
607 ngx_str_t *value; | |
807
3095bf59059b
now the "memcached_pass" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
675
diff
changeset
|
608 ngx_url_t u; |
581 | 609 ngx_http_core_loc_conf_t *clcf; |
610 | |
2392 | 611 if (mlcf->upstream.upstream) { |
581 | 612 return "is duplicate"; |
613 } | |
614 | |
615 value = cf->args->elts; | |
616 | |
807
3095bf59059b
now the "memcached_pass" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
675
diff
changeset
|
617 ngx_memzero(&u, sizeof(ngx_url_t)); |
581 | 618 |
807
3095bf59059b
now the "memcached_pass" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
675
diff
changeset
|
619 u.url = value[1]; |
884 | 620 u.no_resolve = 1; |
815
b630109560b7
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
807
diff
changeset
|
621 |
2392 | 622 mlcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0); |
623 if (mlcf->upstream.upstream == NULL) { | |
884 | 624 return NGX_CONF_ERROR; |
581 | 625 } |
626 | |
627 clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module); | |
628 | |
629 clcf->handler = ngx_http_memcached_handler; | |
630 | |
631 if (clcf->name.data[clcf->name.len - 1] == '/') { | |
632 clcf->auto_redirect = 1; | |
633 } | |
634 | |
2392 | 635 mlcf->index = ngx_http_get_variable_index(cf, &ngx_http_memcached_key); |
1076 | 636 |
2392 | 637 if (mlcf->index == NGX_ERROR) { |
1076 | 638 return NGX_CONF_ERROR; |
639 } | |
640 | |
581 | 641 return NGX_CONF_OK; |
642 } | |
884 | 643 |
644 | |
645 static char * | |
646 ngx_http_memcached_upstream_max_fails_unsupported(ngx_conf_t *cf, | |
647 ngx_command_t *cmd, void *conf) | |
648 { | |
649 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
650 "\"memcached_upstream_max_fails\" is not supported, " | |
651 "use the \"max_fails\" parameter of the \"server\" directive ", | |
652 "inside the \"upstream\" block"); | |
653 | |
654 return NGX_CONF_ERROR; | |
655 } | |
656 | |
657 | |
658 static char * | |
659 ngx_http_memcached_upstream_fail_timeout_unsupported(ngx_conf_t *cf, | |
660 ngx_command_t *cmd, void *conf) | |
661 { | |
662 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
663 "\"memcached_upstream_fail_timeout\" is not supported, " | |
664 "use the \"fail_timeout\" parameter of the \"server\" directive ", | |
665 "inside the \"upstream\" block"); | |
666 | |
667 return NGX_CONF_ERROR; | |
668 } |