Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_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 bffcc5af1d72
comparison
equal deleted inserted replaced
7370:aa1c9f846567 7371:8b68d50090e4
139 { ngx_string("scgi_bind"), 139 { ngx_string("scgi_bind"),
140 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, 140 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12,
141 ngx_http_upstream_bind_set_slot, 141 ngx_http_upstream_bind_set_slot,
142 NGX_HTTP_LOC_CONF_OFFSET, 142 NGX_HTTP_LOC_CONF_OFFSET,
143 offsetof(ngx_http_scgi_loc_conf_t, upstream.local), 143 offsetof(ngx_http_scgi_loc_conf_t, upstream.local),
144 NULL },
145
146 { ngx_string("scgi_socket_keepalive"),
147 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
148 ngx_conf_set_flag_slot,
149 NGX_HTTP_LOC_CONF_OFFSET,
150 offsetof(ngx_http_scgi_loc_conf_t, upstream.socket_keepalive),
144 NULL }, 151 NULL },
145 152
146 { ngx_string("scgi_connect_timeout"), 153 { ngx_string("scgi_connect_timeout"),
147 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 154 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
148 ngx_conf_set_msec_slot, 155 ngx_conf_set_msec_slot,
1198 conf->upstream.request_buffering = NGX_CONF_UNSET; 1205 conf->upstream.request_buffering = NGX_CONF_UNSET;
1199 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; 1206 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
1200 conf->upstream.force_ranges = NGX_CONF_UNSET; 1207 conf->upstream.force_ranges = NGX_CONF_UNSET;
1201 1208
1202 conf->upstream.local = NGX_CONF_UNSET_PTR; 1209 conf->upstream.local = NGX_CONF_UNSET_PTR;
1210 conf->upstream.socket_keepalive = NGX_CONF_UNSET;
1203 1211
1204 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; 1212 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
1205 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; 1213 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
1206 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC; 1214 conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
1207 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC; 1215 conf->upstream.next_upstream_timeout = NGX_CONF_UNSET_MSEC;
1295 ngx_conf_merge_value(conf->upstream.force_ranges, 1303 ngx_conf_merge_value(conf->upstream.force_ranges,
1296 prev->upstream.force_ranges, 0); 1304 prev->upstream.force_ranges, 0);
1297 1305
1298 ngx_conf_merge_ptr_value(conf->upstream.local, 1306 ngx_conf_merge_ptr_value(conf->upstream.local,
1299 prev->upstream.local, NULL); 1307 prev->upstream.local, NULL);
1308
1309 ngx_conf_merge_value(conf->upstream.socket_keepalive,
1310 prev->upstream.socket_keepalive, 0);
1300 1311
1301 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, 1312 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
1302 prev->upstream.connect_timeout, 60000); 1313 prev->upstream.connect_timeout, 60000);
1303 1314
1304 ngx_conf_merge_msec_value(conf->upstream.send_timeout, 1315 ngx_conf_merge_msec_value(conf->upstream.send_timeout,