Mercurial > hg > nginx

comparison src/http/modules/ngx_http_uwsgi_module.c @ 5874:2aff40b3dea2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: proxy_force_ranges and friends. The directives enable byte ranges for both cached and uncached responses regardless of backend headers.
author Roman Arutyunyan <arut@nginx.com>
date Tue, 14 Oct 2014 18:32:01 +0400
parents d09b689911ac
children 973ee2276300
comparison
equal deleted inserted replaced
5873:35b8e5e98508 5874:2aff40b3dea2
234 { ngx_string("uwsgi_busy_buffers_size"), 234 { ngx_string("uwsgi_busy_buffers_size"),
235 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 235 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
236 ngx_conf_set_size_slot, 236 ngx_conf_set_size_slot,
237 NGX_HTTP_LOC_CONF_OFFSET, 237 NGX_HTTP_LOC_CONF_OFFSET,
238 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.busy_buffers_size_conf), 238 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.busy_buffers_size_conf),
239 NULL },
240
241 { ngx_string("uwsgi_force_ranges"),
242 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
243 ngx_conf_set_flag_slot,
244 NGX_HTTP_LOC_CONF_OFFSET,
245 offsetof(ngx_http_uwsgi_loc_conf_t, upstream.force_ranges),
239 NULL }, 246 NULL },
240 247
241 #if (NGX_HTTP_CACHE) 248 #if (NGX_HTTP_CACHE)
242 249
243 { ngx_string("uwsgi_cache"), 250 { ngx_string("uwsgi_cache"),
1269 conf->upstream.store = NGX_CONF_UNSET; 1276 conf->upstream.store = NGX_CONF_UNSET;
1270 conf->upstream.store_access = NGX_CONF_UNSET_UINT; 1277 conf->upstream.store_access = NGX_CONF_UNSET_UINT;
1271 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; 1278 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
1272 conf->upstream.buffering = NGX_CONF_UNSET; 1279 conf->upstream.buffering = NGX_CONF_UNSET;
1273 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; 1280 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
1281 conf->upstream.force_ranges = NGX_CONF_UNSET;
1274 1282
1275 conf->upstream.local = NGX_CONF_UNSET_PTR; 1283 conf->upstream.local = NGX_CONF_UNSET_PTR;
1276 1284
1277 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; 1285 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
1278 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; 1286 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
1351 ngx_conf_merge_value(conf->upstream.buffering, 1359 ngx_conf_merge_value(conf->upstream.buffering,
1352 prev->upstream.buffering, 1); 1360 prev->upstream.buffering, 1);
1353 1361
1354 ngx_conf_merge_value(conf->upstream.ignore_client_abort, 1362 ngx_conf_merge_value(conf->upstream.ignore_client_abort,
1355 prev->upstream.ignore_client_abort, 0); 1363 prev->upstream.ignore_client_abort, 0);
1364
1365 ngx_conf_merge_value(conf->upstream.force_ranges,
1366 prev->upstream.force_ranges, 0);
1356 1367
1357 ngx_conf_merge_ptr_value(conf->upstream.local, 1368 ngx_conf_merge_ptr_value(conf->upstream.local,
1358 prev->upstream.local, NULL); 1369 prev->upstream.local, NULL);
1359 1370
1360 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, 1371 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,