Mercurial > hg > nginx-quic
annotate src/http/modules/ngx_http_upstream_keepalive_module.c @ 6283:86b5f146b121
Version bump.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Tue, 27 Oct 2015 23:16:29 +0300 |
parents | 5e6142609e48 |
children | 78b4e10b4367 |
rev | line source |
---|---|
4127 | 1 |
2 /* | |
3 * Copyright (C) Maxim Dounin | |
4412 | 4 * Copyright (C) Nginx, Inc. |
4127 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 #include <ngx_http.h> | |
11 | |
12 | |
13 typedef struct { | |
14 ngx_uint_t max_cached; | |
15 | |
16 ngx_queue_t cache; | |
17 ngx_queue_t free; | |
18 | |
19 ngx_http_upstream_init_pt original_init_upstream; | |
20 ngx_http_upstream_init_peer_pt original_init_peer; | |
21 | |
22 } ngx_http_upstream_keepalive_srv_conf_t; | |
23 | |
24 | |
25 typedef struct { | |
26 ngx_http_upstream_keepalive_srv_conf_t *conf; | |
27 | |
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
28 ngx_queue_t queue; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
29 ngx_connection_t *connection; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
30 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
31 socklen_t socklen; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
32 u_char sockaddr[NGX_SOCKADDRLEN]; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
33 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
34 } ngx_http_upstream_keepalive_cache_t; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
35 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
36 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
37 typedef struct { |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
38 ngx_http_upstream_keepalive_srv_conf_t *conf; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
39 |
4127 | 40 ngx_http_upstream_t *upstream; |
41 | |
42 void *data; | |
43 | |
44 ngx_event_get_peer_pt original_get_peer; | |
45 ngx_event_free_peer_pt original_free_peer; | |
46 | |
47 #if (NGX_HTTP_SSL) | |
48 ngx_event_set_peer_session_pt original_set_session; | |
49 ngx_event_save_peer_session_pt original_save_session; | |
50 #endif | |
51 | |
52 } ngx_http_upstream_keepalive_peer_data_t; | |
53 | |
54 | |
55 static ngx_int_t ngx_http_upstream_init_keepalive_peer(ngx_http_request_t *r, | |
56 ngx_http_upstream_srv_conf_t *us); | |
57 static ngx_int_t ngx_http_upstream_get_keepalive_peer(ngx_peer_connection_t *pc, | |
58 void *data); | |
59 static void ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, | |
60 void *data, ngx_uint_t state); | |
61 | |
62 static void ngx_http_upstream_keepalive_dummy_handler(ngx_event_t *ev); | |
63 static void ngx_http_upstream_keepalive_close_handler(ngx_event_t *ev); | |
64 static void ngx_http_upstream_keepalive_close(ngx_connection_t *c); | |
65 | |
66 #if (NGX_HTTP_SSL) | |
67 static ngx_int_t ngx_http_upstream_keepalive_set_session( | |
68 ngx_peer_connection_t *pc, void *data); | |
69 static void ngx_http_upstream_keepalive_save_session(ngx_peer_connection_t *pc, | |
70 void *data); | |
71 #endif | |
72 | |
73 static void *ngx_http_upstream_keepalive_create_conf(ngx_conf_t *cf); | |
74 static char *ngx_http_upstream_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, | |
75 void *conf); | |
76 | |
77 | |
78 static ngx_command_t ngx_http_upstream_keepalive_commands[] = { | |
79 | |
80 { ngx_string("keepalive"), | |
5830
3e5b630e0ec9
Upstream keepalive: removed "single" parameter remnants.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5213
diff
changeset
|
81 NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1, |
4127 | 82 ngx_http_upstream_keepalive, |
5213
822b82191940
Upstream keepalive: slightly simplified code.
Ruslan Ermilov <ru@nginx.com>
parents:
5133
diff
changeset
|
83 NGX_HTTP_SRV_CONF_OFFSET, |
4127 | 84 0, |
85 NULL }, | |
86 | |
87 ngx_null_command | |
88 }; | |
89 | |
90 | |
91 static ngx_http_module_t ngx_http_upstream_keepalive_module_ctx = { | |
92 NULL, /* preconfiguration */ | |
93 NULL, /* postconfiguration */ | |
94 | |
95 NULL, /* create main configuration */ | |
96 NULL, /* init main configuration */ | |
97 | |
98 ngx_http_upstream_keepalive_create_conf, /* create server configuration */ | |
99 NULL, /* merge server configuration */ | |
100 | |
101 NULL, /* create location configuration */ | |
102 NULL /* merge location configuration */ | |
103 }; | |
104 | |
105 | |
106 ngx_module_t ngx_http_upstream_keepalive_module = { | |
107 NGX_MODULE_V1, | |
108 &ngx_http_upstream_keepalive_module_ctx, /* module context */ | |
109 ngx_http_upstream_keepalive_commands, /* module directives */ | |
110 NGX_HTTP_MODULE, /* module type */ | |
111 NULL, /* init master */ | |
112 NULL, /* init module */ | |
113 NULL, /* init process */ | |
114 NULL, /* init thread */ | |
115 NULL, /* exit thread */ | |
116 NULL, /* exit process */ | |
117 NULL, /* exit master */ | |
118 NGX_MODULE_V1_PADDING | |
119 }; | |
120 | |
121 | |
122 static ngx_int_t | |
123 ngx_http_upstream_init_keepalive(ngx_conf_t *cf, | |
124 ngx_http_upstream_srv_conf_t *us) | |
125 { | |
126 ngx_uint_t i; | |
127 ngx_http_upstream_keepalive_srv_conf_t *kcf; | |
128 ngx_http_upstream_keepalive_cache_t *cached; | |
129 | |
130 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, | |
131 "init keepalive"); | |
132 | |
133 kcf = ngx_http_conf_upstream_srv_conf(us, | |
134 ngx_http_upstream_keepalive_module); | |
135 | |
136 if (kcf->original_init_upstream(cf, us) != NGX_OK) { | |
137 return NGX_ERROR; | |
138 } | |
139 | |
140 kcf->original_init_peer = us->peer.init; | |
141 | |
142 us->peer.init = ngx_http_upstream_init_keepalive_peer; | |
143 | |
144 /* allocate cache items and add to free queue */ | |
145 | |
146 cached = ngx_pcalloc(cf->pool, | |
147 sizeof(ngx_http_upstream_keepalive_cache_t) * kcf->max_cached); | |
148 if (cached == NULL) { | |
149 return NGX_ERROR; | |
150 } | |
151 | |
152 ngx_queue_init(&kcf->cache); | |
153 ngx_queue_init(&kcf->free); | |
154 | |
155 for (i = 0; i < kcf->max_cached; i++) { | |
156 ngx_queue_insert_head(&kcf->free, &cached[i].queue); | |
157 cached[i].conf = kcf; | |
158 } | |
159 | |
160 return NGX_OK; | |
161 } | |
162 | |
163 | |
164 static ngx_int_t | |
165 ngx_http_upstream_init_keepalive_peer(ngx_http_request_t *r, | |
166 ngx_http_upstream_srv_conf_t *us) | |
167 { | |
168 ngx_http_upstream_keepalive_peer_data_t *kp; | |
169 ngx_http_upstream_keepalive_srv_conf_t *kcf; | |
170 | |
171 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
172 "init keepalive peer"); | |
173 | |
174 kcf = ngx_http_conf_upstream_srv_conf(us, | |
175 ngx_http_upstream_keepalive_module); | |
176 | |
177 kp = ngx_palloc(r->pool, sizeof(ngx_http_upstream_keepalive_peer_data_t)); | |
178 if (kp == NULL) { | |
179 return NGX_ERROR; | |
180 } | |
181 | |
182 if (kcf->original_init_peer(r, us) != NGX_OK) { | |
183 return NGX_ERROR; | |
184 } | |
185 | |
186 kp->conf = kcf; | |
187 kp->upstream = r->upstream; | |
188 kp->data = r->upstream->peer.data; | |
189 kp->original_get_peer = r->upstream->peer.get; | |
190 kp->original_free_peer = r->upstream->peer.free; | |
191 | |
192 r->upstream->peer.data = kp; | |
193 r->upstream->peer.get = ngx_http_upstream_get_keepalive_peer; | |
194 r->upstream->peer.free = ngx_http_upstream_free_keepalive_peer; | |
195 | |
196 #if (NGX_HTTP_SSL) | |
197 kp->original_set_session = r->upstream->peer.set_session; | |
198 kp->original_save_session = r->upstream->peer.save_session; | |
199 r->upstream->peer.set_session = ngx_http_upstream_keepalive_set_session; | |
200 r->upstream->peer.save_session = ngx_http_upstream_keepalive_save_session; | |
201 #endif | |
202 | |
203 return NGX_OK; | |
204 } | |
205 | |
206 | |
207 static ngx_int_t | |
208 ngx_http_upstream_get_keepalive_peer(ngx_peer_connection_t *pc, void *data) | |
209 { | |
210 ngx_http_upstream_keepalive_peer_data_t *kp = data; | |
211 ngx_http_upstream_keepalive_cache_t *item; | |
212 | |
213 ngx_int_t rc; | |
214 ngx_queue_t *q, *cache; | |
215 ngx_connection_t *c; | |
216 | |
217 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0, | |
218 "get keepalive peer"); | |
219 | |
4694
5b5c07dee156
Upstream keepalive: "single" parameter deprecated.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
220 /* ask balancer */ |
4127 | 221 |
222 rc = kp->original_get_peer(pc, kp->data); | |
223 | |
4694
5b5c07dee156
Upstream keepalive: "single" parameter deprecated.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
224 if (rc != NGX_OK) { |
4127 | 225 return rc; |
226 } | |
227 | |
228 /* search cache for suitable connection */ | |
229 | |
230 cache = &kp->conf->cache; | |
231 | |
232 for (q = ngx_queue_head(cache); | |
233 q != ngx_queue_sentinel(cache); | |
234 q = ngx_queue_next(q)) | |
235 { | |
236 item = ngx_queue_data(q, ngx_http_upstream_keepalive_cache_t, queue); | |
237 c = item->connection; | |
238 | |
239 if (ngx_memn2cmp((u_char *) &item->sockaddr, (u_char *) pc->sockaddr, | |
240 item->socklen, pc->socklen) | |
241 == 0) | |
242 { | |
243 ngx_queue_remove(q); | |
244 ngx_queue_insert_head(&kp->conf->free, q); | |
245 | |
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
246 goto found; |
4127 | 247 } |
248 } | |
249 | |
250 return NGX_OK; | |
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
251 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
252 found: |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
253 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
254 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
255 "get keepalive peer: using connection %p", c); |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
256 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
257 c->idle = 0; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
258 c->sent = 0; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
259 c->log = pc->log; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
260 c->read->log = pc->log; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
261 c->write->log = pc->log; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
262 c->pool->log = pc->log; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
263 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
264 pc->connection = c; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
265 pc->cached = 1; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
266 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
267 return NGX_DONE; |
4127 | 268 } |
269 | |
270 | |
271 static void | |
272 ngx_http_upstream_free_keepalive_peer(ngx_peer_connection_t *pc, void *data, | |
273 ngx_uint_t state) | |
274 { | |
275 ngx_http_upstream_keepalive_peer_data_t *kp = data; | |
276 ngx_http_upstream_keepalive_cache_t *item; | |
277 | |
278 ngx_queue_t *q; | |
279 ngx_connection_t *c; | |
280 ngx_http_upstream_t *u; | |
281 | |
282 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0, | |
283 "free keepalive peer"); | |
284 | |
285 /* cache valid connections */ | |
286 | |
287 u = kp->upstream; | |
288 c = pc->connection; | |
289 | |
5133
089a662c17d1
Upstream: removed double-free workarounds in peer.free() methods.
Ruslan Ermilov <ru@nginx.com>
parents:
4998
diff
changeset
|
290 if (state & NGX_PEER_FAILED |
4127 | 291 || c == NULL |
292 || c->read->eof | |
293 || c->read->error | |
294 || c->read->timedout | |
295 || c->write->error | |
296 || c->write->timedout) | |
297 { | |
298 goto invalid; | |
299 } | |
300 | |
301 if (!u->keepalive) { | |
302 goto invalid; | |
303 } | |
304 | |
6220
5e6142609e48
Core: idle connections now closed only once on exiting.
Valentin Bartenev <vbart@nginx.com>
parents:
6167
diff
changeset
|
305 if (ngx_terminate || ngx_exiting) { |
5e6142609e48
Core: idle connections now closed only once on exiting.
Valentin Bartenev <vbart@nginx.com>
parents:
6167
diff
changeset
|
306 goto invalid; |
5e6142609e48
Core: idle connections now closed only once on exiting.
Valentin Bartenev <vbart@nginx.com>
parents:
6167
diff
changeset
|
307 } |
5e6142609e48
Core: idle connections now closed only once on exiting.
Valentin Bartenev <vbart@nginx.com>
parents:
6167
diff
changeset
|
308 |
4127 | 309 if (ngx_handle_read_event(c->read, 0) != NGX_OK) { |
310 goto invalid; | |
311 } | |
312 | |
313 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, | |
314 "free keepalive peer: saving connection %p", c); | |
315 | |
316 if (ngx_queue_empty(&kp->conf->free)) { | |
317 | |
318 q = ngx_queue_last(&kp->conf->cache); | |
319 ngx_queue_remove(q); | |
320 | |
321 item = ngx_queue_data(q, ngx_http_upstream_keepalive_cache_t, queue); | |
322 | |
323 ngx_http_upstream_keepalive_close(item->connection); | |
324 | |
325 } else { | |
326 q = ngx_queue_head(&kp->conf->free); | |
327 ngx_queue_remove(q); | |
328 | |
329 item = ngx_queue_data(q, ngx_http_upstream_keepalive_cache_t, queue); | |
330 } | |
331 | |
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
332 ngx_queue_insert_head(&kp->conf->cache, q); |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
333 |
4127 | 334 item->connection = c; |
335 | |
336 pc->connection = NULL; | |
337 | |
338 if (c->read->timer_set) { | |
339 ngx_del_timer(c->read); | |
340 } | |
341 if (c->write->timer_set) { | |
342 ngx_del_timer(c->write); | |
343 } | |
344 | |
345 c->write->handler = ngx_http_upstream_keepalive_dummy_handler; | |
346 c->read->handler = ngx_http_upstream_keepalive_close_handler; | |
347 | |
348 c->data = item; | |
349 c->idle = 1; | |
350 c->log = ngx_cycle->log; | |
351 c->read->log = ngx_cycle->log; | |
352 c->write->log = ngx_cycle->log; | |
353 c->pool->log = ngx_cycle->log; | |
354 | |
355 item->socklen = pc->socklen; | |
356 ngx_memcpy(&item->sockaddr, pc->sockaddr, pc->socklen); | |
357 | |
358 if (c->read->ready) { | |
359 ngx_http_upstream_keepalive_close_handler(c->read); | |
360 } | |
361 | |
362 invalid: | |
363 | |
364 kp->original_free_peer(pc, kp->data, state); | |
365 } | |
366 | |
367 | |
368 static void | |
369 ngx_http_upstream_keepalive_dummy_handler(ngx_event_t *ev) | |
370 { | |
371 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ev->log, 0, | |
372 "keepalive dummy handler"); | |
373 } | |
374 | |
375 | |
376 static void | |
377 ngx_http_upstream_keepalive_close_handler(ngx_event_t *ev) | |
378 { | |
379 ngx_http_upstream_keepalive_srv_conf_t *conf; | |
380 ngx_http_upstream_keepalive_cache_t *item; | |
381 | |
382 int n; | |
383 char buf[1]; | |
384 ngx_connection_t *c; | |
385 | |
386 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ev->log, 0, | |
387 "keepalive close handler"); | |
388 | |
389 c = ev->data; | |
390 | |
391 if (c->close) { | |
392 goto close; | |
393 } | |
394 | |
395 n = recv(c->fd, buf, 1, MSG_PEEK); | |
396 | |
397 if (n == -1 && ngx_socket_errno == NGX_EAGAIN) { | |
5999
4d8936b1fc32
Upstream keepalive: drop ready flag on EAGAIN from recv(MSG_PEEK).
Valentin Bartenev <vbart@nginx.com>
parents:
5864
diff
changeset
|
398 ev->ready = 0; |
4127 | 399 |
400 if (ngx_handle_read_event(c->read, 0) != NGX_OK) { | |
401 goto close; | |
402 } | |
403 | |
404 return; | |
405 } | |
406 | |
407 close: | |
408 | |
409 item = c->data; | |
410 conf = item->conf; | |
411 | |
412 ngx_http_upstream_keepalive_close(c); | |
413 | |
414 ngx_queue_remove(&item->queue); | |
415 ngx_queue_insert_head(&conf->free, &item->queue); | |
416 } | |
417 | |
418 | |
419 static void | |
420 ngx_http_upstream_keepalive_close(ngx_connection_t *c) | |
421 { | |
422 | |
423 #if (NGX_HTTP_SSL) | |
424 | |
425 if (c->ssl) { | |
426 c->ssl->no_wait_shutdown = 1; | |
427 c->ssl->no_send_shutdown = 1; | |
428 | |
429 if (ngx_ssl_shutdown(c) == NGX_AGAIN) { | |
430 c->ssl->handler = ngx_http_upstream_keepalive_close; | |
431 return; | |
432 } | |
433 } | |
434 | |
435 #endif | |
436 | |
437 ngx_destroy_pool(c->pool); | |
438 ngx_close_connection(c); | |
439 } | |
440 | |
441 | |
442 #if (NGX_HTTP_SSL) | |
443 | |
444 static ngx_int_t | |
445 ngx_http_upstream_keepalive_set_session(ngx_peer_connection_t *pc, void *data) | |
446 { | |
447 ngx_http_upstream_keepalive_peer_data_t *kp = data; | |
448 | |
449 return kp->original_set_session(pc, kp->data); | |
450 } | |
451 | |
452 | |
453 static void | |
454 ngx_http_upstream_keepalive_save_session(ngx_peer_connection_t *pc, void *data) | |
455 { | |
456 ngx_http_upstream_keepalive_peer_data_t *kp = data; | |
457 | |
458 kp->original_save_session(pc, kp->data); | |
459 return; | |
460 } | |
461 | |
462 #endif | |
463 | |
464 | |
465 static void * | |
466 ngx_http_upstream_keepalive_create_conf(ngx_conf_t *cf) | |
467 { | |
468 ngx_http_upstream_keepalive_srv_conf_t *conf; | |
469 | |
470 conf = ngx_pcalloc(cf->pool, | |
471 sizeof(ngx_http_upstream_keepalive_srv_conf_t)); | |
472 if (conf == NULL) { | |
473 return NULL; | |
474 } | |
475 | |
476 /* | |
477 * set by ngx_pcalloc(): | |
478 * | |
479 * conf->original_init_upstream = NULL; | |
480 * conf->original_init_peer = NULL; | |
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
481 * conf->max_cached = 0; |
4127 | 482 */ |
483 | |
484 return conf; | |
485 } | |
486 | |
487 | |
488 static char * | |
489 ngx_http_upstream_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
490 { | |
491 ngx_http_upstream_srv_conf_t *uscf; | |
5213
822b82191940
Upstream keepalive: slightly simplified code.
Ruslan Ermilov <ru@nginx.com>
parents:
5133
diff
changeset
|
492 ngx_http_upstream_keepalive_srv_conf_t *kcf = conf; |
4127 | 493 |
494 ngx_int_t n; | |
495 ngx_str_t *value; | |
496 | |
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
497 if (kcf->max_cached) { |
4998
82336a9ce26d
Upstream keepalive: detect duplicate "keepalive" directive.
Ruslan Ermilov <ru@nginx.com>
parents:
4694
diff
changeset
|
498 return "is duplicate"; |
82336a9ce26d
Upstream keepalive: detect duplicate "keepalive" directive.
Ruslan Ermilov <ru@nginx.com>
parents:
4694
diff
changeset
|
499 } |
82336a9ce26d
Upstream keepalive: detect duplicate "keepalive" directive.
Ruslan Ermilov <ru@nginx.com>
parents:
4694
diff
changeset
|
500 |
4127 | 501 /* read options */ |
502 | |
503 value = cf->args->elts; | |
504 | |
505 n = ngx_atoi(value[1].data, value[1].len); | |
506 | |
507 if (n == NGX_ERROR || n == 0) { | |
508 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
509 "invalid value \"%V\" in \"%V\" directive", | |
510 &value[1], &cmd->name); | |
511 return NGX_CONF_ERROR; | |
512 } | |
513 | |
514 kcf->max_cached = n; | |
515 | |
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
516 uscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_upstream_module); |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
517 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
518 kcf->original_init_upstream = uscf->peer.init_upstream |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
519 ? uscf->peer.init_upstream |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
520 : ngx_http_upstream_init_round_robin; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
521 |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
522 uscf->peer.init_upstream = ngx_http_upstream_init_keepalive; |
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
523 |
4127 | 524 return NGX_CONF_OK; |
525 } |