Mercurial > hg > nginx

comparison src/http/modules/ngx_http_fastcgi_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 52b4984d2b3c
children 973ee2276300
comparison
equal deleted inserted replaced
5873:35b8e5e98508 5874:2aff40b3dea2
324 ngx_conf_set_size_slot, 324 ngx_conf_set_size_slot,
325 NGX_HTTP_LOC_CONF_OFFSET, 325 NGX_HTTP_LOC_CONF_OFFSET,
326 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.busy_buffers_size_conf), 326 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.busy_buffers_size_conf),
327 NULL }, 327 NULL },
328 328
329 { ngx_string("fastcgi_force_ranges"),
330 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
331 ngx_conf_set_flag_slot,
332 NGX_HTTP_LOC_CONF_OFFSET,
333 offsetof(ngx_http_fastcgi_loc_conf_t, upstream.force_ranges),
334 NULL },
335
329 #if (NGX_HTTP_CACHE) 336 #if (NGX_HTTP_CACHE)
330 337
331 { ngx_string("fastcgi_cache"), 338 { ngx_string("fastcgi_cache"),
332 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 339 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
333 ngx_http_fastcgi_cache, 340 ngx_http_fastcgi_cache,
2330 conf->upstream.store = NGX_CONF_UNSET; 2337 conf->upstream.store = NGX_CONF_UNSET;
2331 conf->upstream.store_access = NGX_CONF_UNSET_UINT; 2338 conf->upstream.store_access = NGX_CONF_UNSET_UINT;
2332 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; 2339 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
2333 conf->upstream.buffering = NGX_CONF_UNSET; 2340 conf->upstream.buffering = NGX_CONF_UNSET;
2334 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; 2341 conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
2342 conf->upstream.force_ranges = NGX_CONF_UNSET;
2335 2343
2336 conf->upstream.local = NGX_CONF_UNSET_PTR; 2344 conf->upstream.local = NGX_CONF_UNSET_PTR;
2337 2345
2338 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; 2346 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
2339 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; 2347 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
2410 ngx_conf_merge_value(conf->upstream.buffering, 2418 ngx_conf_merge_value(conf->upstream.buffering,
2411 prev->upstream.buffering, 1); 2419 prev->upstream.buffering, 1);
2412 2420
2413 ngx_conf_merge_value(conf->upstream.ignore_client_abort, 2421 ngx_conf_merge_value(conf->upstream.ignore_client_abort,
2414 prev->upstream.ignore_client_abort, 0); 2422 prev->upstream.ignore_client_abort, 0);
2423
2424 ngx_conf_merge_value(conf->upstream.force_ranges,
2425 prev->upstream.force_ranges, 0);
2415 2426
2416 ngx_conf_merge_ptr_value(conf->upstream.local, 2427 ngx_conf_merge_ptr_value(conf->upstream.local,
2417 prev->upstream.local, NULL); 2428 prev->upstream.local, NULL);
2418 2429
2419 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, 2430 ngx_conf_merge_msec_value(conf->upstream.connect_timeout,