Mercurial > hg > nginx-quic

comparison src/http/modules/ngx_http_fastcgi_module.c @ 7371:8b68d50090e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 45e513c3540d
children 05e42236e95b
comparison
equal deleted inserted replaced
7370:aa1c9f846567 7371:8b68d50090e4
284 ngx_http_upstream_bind_set_slot, 284 ngx_http_upstream_bind_set_slot,
285 NGX_HTTP_LOC_CONF_OFFSET, 285 NGX_HTTP_LOC_CONF_OFFSET,
286 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.local), 286 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.local),
287 NULL }, 287 NULL },
288 288
289 { ngx_string("fastcgi_socket_keepalive"),
290 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
291 ngx_conf_set_flag_slot,
292 NGX_HTTP_LOC_CONF_OFFSET,
293 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.socket_keepalive),
294 NULL },
295
289 { ngx_string("fastcgi_connect_timeout"), 296 { ngx_string("fastcgi_connect_timeout"),
290 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 297 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
291 ngx_conf_set_msec_slot, 298 ngx_conf_set_msec_slot,
292 NGX_HTTP_LOC_CONF_OFFSET, 299 NGX_HTTP_LOC_CONF_OFFSET,
293 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.connect_timeout), 300 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.connect_timeout),
2719 conf->upstream.request_buffering = NGX_CONF_UNSET; 2726 conf->upstream.request_buffering = NGX_CONF_UNSET;
2720 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; 2727 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
2721 conf->upstream.force_ranges = NGX_CONF_UNSET; 2728 conf->upstream.force_ranges = NGX_CONF_UNSET;
2722 2729
2723 conf->upstream.local = NGX_CONF_UNSET_PTR; 2730 conf->upstream.local = NGX_CONF_UNSET_PTR;
2731 conf->upstream.socket_keepalive = NGX_CONF_UNSET;
2724 2732
2725 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; 2733 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
2726 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; 2734 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
2727 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; 2735 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
2728 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC; 2736 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC;
2821 ngx_conf_merge_value(conf->upstream.force_ranges, 2829 ngx_conf_merge_value(conf->upstream.force_ranges,
2822 prev->upstream.force_ranges, 0); 2830 prev->upstream.force_ranges, 0);
2823 2831
2824 ngx_conf_merge_ptr_value(conf->upstream.local, 2832 ngx_conf_merge_ptr_value(conf->upstream.local,
2825 prev->upstream.local, NULL); 2833 prev->upstream.local, NULL);
2834
2835 ngx_conf_merge_value(conf->upstream.socket_keepalive,
2836 prev->upstream.socket_keepalive, 0);
2826 2837
2827 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, 2838 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
2828 prev->upstream.connect_timeout, 60000); 2839 prev->upstream.connect_timeout, 60000);
2829 2840
2830 ngx_conf_merge_msec_value(conf->upstream.send_timeout, 2841 ngx_conf_merge_msec_value(conf->upstream.send_timeout,