Mercurial > hg > nginx
comparison src/http/modules/ngx_http_uwsgi_module.c @ 7371:8b68d50090e4
Upstream: proxy_socket_keepalive and friends.
The directives enable the use of the SO_KEEPALIVE option on
upstream connections. By default, the value is left unchanged.
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Wed, 03 Oct 2018 14:08:51 +0300 |
parents | f6e7831a17d4 |
children | 8981dbb12254 |
comparison
equal
deleted
inserted
replaced
7370:aa1c9f846567 | 7371:8b68d50090e4 |
---|---|
200 { ngx_string("uwsgi_bind"), | 200 { ngx_string("uwsgi_bind"), |
201 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, | 201 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, |
202 ngx_http_upstream_bind_set_slot, | 202 ngx_http_upstream_bind_set_slot, |
203 NGX_HTTP_LOC_CONF_OFFSET, | 203 NGX_HTTP_LOC_CONF_OFFSET, |
204 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.local), | 204 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.local), |
205 NULL }, | |
206 | |
207 { ngx_string("uwsgi_socket_keepalive"), | |
208 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
209 ngx_conf_set_flag_slot, | |
210 NGX_HTTP_LOC_CONF_OFFSET, | |
211 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.socket_keepalive), | |
205 NULL }, | 212 NULL }, |
206 | 213 |
207 { ngx_string("uwsgi_connect_timeout"), | 214 { ngx_string("uwsgi_connect_timeout"), |
208 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 215 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
209 ngx_conf_set_msec_slot, | 216 ngx_conf_set_msec_slot, |
1411 conf->upstream.request_buffering = NGX_CONF_UNSET; | 1418 conf->upstream.request_buffering = NGX_CONF_UNSET; |
1412 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; | 1419 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
1413 conf->upstream.force_ranges = NGX_CONF_UNSET; | 1420 conf->upstream.force_ranges = NGX_CONF_UNSET; |
1414 | 1421 |
1415 conf->upstream.local = NGX_CONF_UNSET_PTR; | 1422 conf->upstream.local = NGX_CONF_UNSET_PTR; |
1423 conf->upstream.socket_keepalive = NGX_CONF_UNSET; | |
1416 | 1424 |
1417 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; | 1425 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
1418 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | 1426 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; |
1419 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; | 1427 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; |
1420 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC; | 1428 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC; |
1516 ngx_conf_merge_value(conf->upstream.force_ranges, | 1524 ngx_conf_merge_value(conf->upstream.force_ranges, |
1517 prev->upstream.force_ranges, 0); | 1525 prev->upstream.force_ranges, 0); |
1518 | 1526 |
1519 ngx_conf_merge_ptr_value(conf->upstream.local, | 1527 ngx_conf_merge_ptr_value(conf->upstream.local, |
1520 prev->upstream.local, NULL); | 1528 prev->upstream.local, NULL); |
1529 | |
1530 ngx_conf_merge_value(conf->upstream.socket_keepalive, | |
1531 prev->upstream.socket_keepalive, 0); | |
1521 | 1532 |
1522 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, | 1533 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, |
1523 prev->upstream.connect_timeout, 60000); | 1534 prev->upstream.connect_timeout, 60000); |
1524 | 1535 |
1525 ngx_conf_merge_msec_value(conf->upstream.send_timeout, | 1536 ngx_conf_merge_msec_value(conf->upstream.send_timeout, |