Mercurial > hg > nginx
annotate src/http/modules/ngx_http_upstream_keepalive_module.c @ 7213:c69c13f10502
Geo: fixed memory allocation error handling (closes #1482).
If during configuration parsing of the geo directive the memory
allocation has failed, pool used to parse configuration inside
the block, and sometimes the temporary pool were not destroyed.
| author | Ruslan Ermilov <ru@nginx.com> |
|---|---|
| date | Wed, 21 Feb 2018 15:50:42 +0300 |
| parents | 1cb92a2d672e |
| children | 46174066b75f |
| 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; |
|
6559
adf25b8d0431
Introduced the ngx_sockaddr_t type.
Ruslan Ermilov <ru@nginx.com>
parents:
6332
diff
changeset
|
32 ngx_sockaddr_t sockaddr; |
|
6167
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 | |
|
6332
78b4e10b4367
Upstream: don't keep connections on early responses (ticket #669).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6220
diff
changeset
|
305 if (!u->request_body_sent) { |
|
78b4e10b4367
Upstream: don't keep connections on early responses (ticket #669).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6220
diff
changeset
|
306 goto invalid; |
|
78b4e10b4367
Upstream: don't keep connections on early responses (ticket #669).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6220
diff
changeset
|
307 } |
|
78b4e10b4367
Upstream: don't keep connections on early responses (ticket #669).
Maxim Dounin <mdounin@mdounin.ru>
parents:
6220
diff
changeset
|
308 |
|
6220
5e6142609e48
Core: idle connections now closed only once on exiting.
Valentin Bartenev <vbart@nginx.com>
parents:
6167
diff
changeset
|
309 if (ngx_terminate || ngx_exiting) { |
|
5e6142609e48
Core: idle connections now closed only once on exiting.
Valentin Bartenev <vbart@nginx.com>
parents:
6167
diff
changeset
|
310 goto invalid; |
|
5e6142609e48
Core: idle connections now closed only once on exiting.
Valentin Bartenev <vbart@nginx.com>
parents:
6167
diff
changeset
|
311 } |
|
5e6142609e48
Core: idle connections now closed only once on exiting.
Valentin Bartenev <vbart@nginx.com>
parents:
6167
diff
changeset
|
312 |
| 4127 | 313 if (ngx_handle_read_event(c->read, 0) != NGX_OK) { |
| 314 goto invalid; | |
| 315 } | |
| 316 | |
| 317 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, | |
| 318 "free keepalive peer: saving connection %p", c); | |
| 319 | |
| 320 if (ngx_queue_empty(&kp->conf->free)) { | |
| 321 | |
| 322 q = ngx_queue_last(&kp->conf->cache); | |
| 323 ngx_queue_remove(q); | |
| 324 | |
| 325 item = ngx_queue_data(q, ngx_http_upstream_keepalive_cache_t, queue); | |
| 326 | |
| 327 ngx_http_upstream_keepalive_close(item->connection); | |
| 328 | |
| 329 } else { | |
| 330 q = ngx_queue_head(&kp->conf->free); | |
| 331 ngx_queue_remove(q); | |
| 332 | |
| 333 item = ngx_queue_data(q, ngx_http_upstream_keepalive_cache_t, queue); | |
| 334 } | |
| 335 | |
|
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
336 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
|
337 |
| 4127 | 338 item->connection = c; |
| 339 | |
| 340 pc->connection = NULL; | |
| 341 | |
| 342 if (c->read->timer_set) { | |
|
7165
1cb92a2d672e
Upstream keepalive: clean read delayed flag in stored connections.
Roman Arutyunyan <arut@nginx.com>
parents:
6559
diff
changeset
|
343 c->read->delayed = 0; |
| 4127 | 344 ngx_del_timer(c->read); |
| 345 } | |
| 346 if (c->write->timer_set) { | |
| 347 ngx_del_timer(c->write); | |
| 348 } | |
| 349 | |
| 350 c->write->handler = ngx_http_upstream_keepalive_dummy_handler; | |
| 351 c->read->handler = ngx_http_upstream_keepalive_close_handler; | |
| 352 | |
| 353 c->data = item; | |
| 354 c->idle = 1; | |
| 355 c->log = ngx_cycle->log; | |
| 356 c->read->log = ngx_cycle->log; | |
| 357 c->write->log = ngx_cycle->log; | |
| 358 c->pool->log = ngx_cycle->log; | |
| 359 | |
| 360 item->socklen = pc->socklen; | |
| 361 ngx_memcpy(&item->sockaddr, pc->sockaddr, pc->socklen); | |
| 362 | |
| 363 if (c->read->ready) { | |
| 364 ngx_http_upstream_keepalive_close_handler(c->read); | |
| 365 } | |
| 366 | |
| 367 invalid: | |
| 368 | |
| 369 kp->original_free_peer(pc, kp->data, state); | |
| 370 } | |
| 371 | |
| 372 | |
| 373 static void | |
| 374 ngx_http_upstream_keepalive_dummy_handler(ngx_event_t *ev) | |
| 375 { | |
| 376 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ev->log, 0, | |
| 377 "keepalive dummy handler"); | |
| 378 } | |
| 379 | |
| 380 | |
| 381 static void | |
| 382 ngx_http_upstream_keepalive_close_handler(ngx_event_t *ev) | |
| 383 { | |
| 384 ngx_http_upstream_keepalive_srv_conf_t *conf; | |
| 385 ngx_http_upstream_keepalive_cache_t *item; | |
| 386 | |
| 387 int n; | |
| 388 char buf[1]; | |
| 389 ngx_connection_t *c; | |
| 390 | |
| 391 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ev->log, 0, | |
| 392 "keepalive close handler"); | |
| 393 | |
| 394 c = ev->data; | |
| 395 | |
| 396 if (c->close) { | |
| 397 goto close; | |
| 398 } | |
| 399 | |
| 400 n = recv(c->fd, buf, 1, MSG_PEEK); | |
| 401 | |
| 402 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
|
403 ev->ready = 0; |
| 4127 | 404 |
| 405 if (ngx_handle_read_event(c->read, 0) != NGX_OK) { | |
| 406 goto close; | |
| 407 } | |
| 408 | |
| 409 return; | |
| 410 } | |
| 411 | |
| 412 close: | |
| 413 | |
| 414 item = c->data; | |
| 415 conf = item->conf; | |
| 416 | |
| 417 ngx_http_upstream_keepalive_close(c); | |
| 418 | |
| 419 ngx_queue_remove(&item->queue); | |
| 420 ngx_queue_insert_head(&conf->free, &item->queue); | |
| 421 } | |
| 422 | |
| 423 | |
| 424 static void | |
| 425 ngx_http_upstream_keepalive_close(ngx_connection_t *c) | |
| 426 { | |
| 427 | |
| 428 #if (NGX_HTTP_SSL) | |
| 429 | |
| 430 if (c->ssl) { | |
| 431 c->ssl->no_wait_shutdown = 1; | |
| 432 c->ssl->no_send_shutdown = 1; | |
| 433 | |
| 434 if (ngx_ssl_shutdown(c) == NGX_AGAIN) { | |
| 435 c->ssl->handler = ngx_http_upstream_keepalive_close; | |
| 436 return; | |
| 437 } | |
| 438 } | |
| 439 | |
| 440 #endif | |
| 441 | |
| 442 ngx_destroy_pool(c->pool); | |
| 443 ngx_close_connection(c); | |
| 444 } | |
| 445 | |
| 446 | |
| 447 #if (NGX_HTTP_SSL) | |
| 448 | |
| 449 static ngx_int_t | |
| 450 ngx_http_upstream_keepalive_set_session(ngx_peer_connection_t *pc, void *data) | |
| 451 { | |
| 452 ngx_http_upstream_keepalive_peer_data_t *kp = data; | |
| 453 | |
| 454 return kp->original_set_session(pc, kp->data); | |
| 455 } | |
| 456 | |
| 457 | |
| 458 static void | |
| 459 ngx_http_upstream_keepalive_save_session(ngx_peer_connection_t *pc, void *data) | |
| 460 { | |
| 461 ngx_http_upstream_keepalive_peer_data_t *kp = data; | |
| 462 | |
| 463 kp->original_save_session(pc, kp->data); | |
| 464 return; | |
| 465 } | |
| 466 | |
| 467 #endif | |
| 468 | |
| 469 | |
| 470 static void * | |
| 471 ngx_http_upstream_keepalive_create_conf(ngx_conf_t *cf) | |
| 472 { | |
| 473 ngx_http_upstream_keepalive_srv_conf_t *conf; | |
| 474 | |
| 475 conf = ngx_pcalloc(cf->pool, | |
| 476 sizeof(ngx_http_upstream_keepalive_srv_conf_t)); | |
| 477 if (conf == NULL) { | |
| 478 return NULL; | |
| 479 } | |
| 480 | |
| 481 /* | |
| 482 * set by ngx_pcalloc(): | |
| 483 * | |
| 484 * conf->original_init_upstream = NULL; | |
| 485 * 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
|
486 * conf->max_cached = 0; |
| 4127 | 487 */ |
| 488 | |
| 489 return conf; | |
| 490 } | |
| 491 | |
| 492 | |
| 493 static char * | |
| 494 ngx_http_upstream_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 495 { | |
| 496 ngx_http_upstream_srv_conf_t *uscf; | |
|
5213
822b82191940
Upstream keepalive: slightly simplified code.
Ruslan Ermilov <ru@nginx.com>
parents:
5133
diff
changeset
|
497 ngx_http_upstream_keepalive_srv_conf_t *kcf = conf; |
| 4127 | 498 |
| 499 ngx_int_t n; | |
| 500 ngx_str_t *value; | |
| 501 | |
|
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
502 if (kcf->max_cached) { |
|
4998
82336a9ce26d
Upstream keepalive: detect duplicate "keepalive" directive.
Ruslan Ermilov <ru@nginx.com>
parents:
4694
diff
changeset
|
503 return "is duplicate"; |
|
82336a9ce26d
Upstream keepalive: detect duplicate "keepalive" directive.
Ruslan Ermilov <ru@nginx.com>
parents:
4694
diff
changeset
|
504 } |
|
82336a9ce26d
Upstream keepalive: detect duplicate "keepalive" directive.
Ruslan Ermilov <ru@nginx.com>
parents:
4694
diff
changeset
|
505 |
| 4127 | 506 /* read options */ |
| 507 | |
| 508 value = cf->args->elts; | |
| 509 | |
| 510 n = ngx_atoi(value[1].data, value[1].len); | |
| 511 | |
| 512 if (n == NGX_ERROR || n == 0) { | |
| 513 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 514 "invalid value \"%V\" in \"%V\" directive", | |
| 515 &value[1], &cmd->name); | |
| 516 return NGX_CONF_ERROR; | |
| 517 } | |
| 518 | |
| 519 kcf->max_cached = n; | |
| 520 | |
|
6167
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
521 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
|
522 |
|
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
523 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
|
524 ? uscf->peer.init_upstream |
|
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
525 : 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
|
526 |
|
87d48f8793b6
Upstream keepalive: reduced diffs to the plus version of nginx.
Roman Arutyunyan <arut@nginx.com>
parents:
5999
diff
changeset
|
527 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
|
528 |
| 4127 | 529 return NGX_CONF_OK; |
| 530 } |