Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_module.c @ 5874:2aff40b3dea2
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 |
---|---|
385 { ngx_string("proxy_busy_buffers_size"), | 385 { ngx_string("proxy_busy_buffers_size"), |
386 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 386 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
387 ngx_conf_set_size_slot, | 387 ngx_conf_set_size_slot, |
388 NGX_HTTP_LOC_CONF_OFFSET, | 388 NGX_HTTP_LOC_CONF_OFFSET, |
389 offsetof(ngx_http_proxy_loc_conf_t, upstream.busy_buffers_size_conf), | 389 offsetof(ngx_http_proxy_loc_conf_t, upstream.busy_buffers_size_conf), |
390 NULL }, | |
391 | |
392 { ngx_string("proxy_force_ranges"), | |
393 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
394 ngx_conf_set_flag_slot, | |
395 NGX_HTTP_LOC_CONF_OFFSET, | |
396 offsetof(ngx_http_proxy_loc_conf_t, upstream.force_ranges), | |
390 NULL }, | 397 NULL }, |
391 | 398 |
392 #if (NGX_HTTP_CACHE) | 399 #if (NGX_HTTP_CACHE) |
393 | 400 |
394 { ngx_string("proxy_cache"), | 401 { ngx_string("proxy_cache"), |
2470 conf->upstream.store = NGX_CONF_UNSET; | 2477 conf->upstream.store = NGX_CONF_UNSET; |
2471 conf->upstream.store_access = NGX_CONF_UNSET_UINT; | 2478 conf->upstream.store_access = NGX_CONF_UNSET_UINT; |
2472 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; | 2479 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; |
2473 conf->upstream.buffering = NGX_CONF_UNSET; | 2480 conf->upstream.buffering = NGX_CONF_UNSET; |
2474 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; | 2481 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
2482 conf->upstream.force_ranges = NGX_CONF_UNSET; | |
2475 | 2483 |
2476 conf->upstream.local = NGX_CONF_UNSET_PTR; | 2484 conf->upstream.local = NGX_CONF_UNSET_PTR; |
2477 | 2485 |
2478 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; | 2486 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
2479 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | 2487 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; |
2565 ngx_conf_merge_value(conf->upstream.buffering, | 2573 ngx_conf_merge_value(conf->upstream.buffering, |
2566 prev->upstream.buffering, 1); | 2574 prev->upstream.buffering, 1); |
2567 | 2575 |
2568 ngx_conf_merge_value(conf->upstream.ignore_client_abort, | 2576 ngx_conf_merge_value(conf->upstream.ignore_client_abort, |
2569 prev->upstream.ignore_client_abort, 0); | 2577 prev->upstream.ignore_client_abort, 0); |
2578 | |
2579 ngx_conf_merge_value(conf->upstream.force_ranges, | |
2580 prev->upstream.force_ranges, 0); | |
2570 | 2581 |
2571 ngx_conf_merge_ptr_value(conf->upstream.local, | 2582 ngx_conf_merge_ptr_value(conf->upstream.local, |
2572 prev->upstream.local, NULL); | 2583 prev->upstream.local, NULL); |
2573 | 2584 |
2574 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, | 2585 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, |