mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: proxy_force_ranges and friends.

Browse Source 
The directives enable byte ranges for both cached and uncached
responses regardless of backend headers.
This commit is contained in:
Roman Arutyunyan 2014-10-14 18:32:01 +04:00
parent 8ae7751878
commit 2244a5e9cf
6 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http/modules/ngx_http_fastcgi_module.c
View File

@ -326,6 +326,13 @@ static ngx_command_t ngx_http_fastcgi_commands[] = {
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.busy_buffers_size_conf), offsetof(ngx_http_fastcgi_loc_conf_t, upstream.busy_buffers_size_conf),
NULL }, NULL },
{ ngx_string("fastcgi_force_ranges"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.force_ranges),
NULL },
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
{ ngx_string("fastcgi_cache"), { ngx_string("fastcgi_cache"),
@ -2332,6 +2339,7 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf)
conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
conf->upstream.buffering = NGX_CONF_UNSET; conf->upstream.buffering = NGX_CONF_UNSET;
conf->upstream.ignore_client_abort = NGX_CONF_UNSET; conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
conf->upstream.force_ranges = NGX_CONF_UNSET;
conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.local = NGX_CONF_UNSET_PTR;
@ -2413,6 +2421,9 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->upstream.ignore_client_abort, ngx_conf_merge_value(conf->upstream.ignore_client_abort,
prev->upstream.ignore_client_abort, 0); prev->upstream.ignore_client_abort, 0);
ngx_conf_merge_value(conf->upstream.force_ranges,
prev->upstream.force_ranges, 0);
ngx_conf_merge_ptr_value(conf->upstream.local, ngx_conf_merge_ptr_value(conf->upstream.local,
prev->upstream.local, NULL); prev->upstream.local, NULL);

11
src/http/modules/ngx_http_proxy_module.c
View File

@ -389,6 +389,13 @@ static ngx_command_t ngx_http_proxy_commands[] = {
offsetof(ngx_http_proxy_loc_conf_t, upstream.busy_buffers_size_conf), offsetof(ngx_http_proxy_loc_conf_t, upstream.busy_buffers_size_conf),
NULL }, NULL },
{ ngx_string("proxy_force_ranges"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_proxy_loc_conf_t, upstream.force_ranges),
NULL },
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
{ ngx_string("proxy_cache"), { ngx_string("proxy_cache"),
@ -2472,6 +2479,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
conf->upstream.buffering = NGX_CONF_UNSET; conf->upstream.buffering = NGX_CONF_UNSET;
conf->upstream.ignore_client_abort = NGX_CONF_UNSET; conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
conf->upstream.force_ranges = NGX_CONF_UNSET;
conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.local = NGX_CONF_UNSET_PTR;
@ -2568,6 +2576,9 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->upstream.ignore_client_abort, ngx_conf_merge_value(conf->upstream.ignore_client_abort,
prev->upstream.ignore_client_abort, 0); prev->upstream.ignore_client_abort, 0);
ngx_conf_merge_value(conf->upstream.force_ranges,
prev->upstream.force_ranges, 0);
ngx_conf_merge_ptr_value(conf->upstream.local, ngx_conf_merge_ptr_value(conf->upstream.local,
prev->upstream.local, NULL); prev->upstream.local, NULL);

11
src/http/modules/ngx_http_scgi_module.c
View File

@ -183,6 +183,13 @@ static ngx_command_t ngx_http_scgi_commands[] = {
offsetof(ngx_http_scgi_loc_conf_t, upstream.busy_buffers_size_conf), offsetof(ngx_http_scgi_loc_conf_t, upstream.busy_buffers_size_conf),
NULL }, NULL },
{ ngx_string("scgi_force_ranges"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_scgi_loc_conf_t, upstream.force_ranges),
NULL },
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
{ ngx_string("scgi_cache"), { ngx_string("scgi_cache"),
@ -1091,6 +1098,7 @@ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf)
conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
conf->upstream.buffering = NGX_CONF_UNSET; conf->upstream.buffering = NGX_CONF_UNSET;
conf->upstream.ignore_client_abort = NGX_CONF_UNSET; conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
conf->upstream.force_ranges = NGX_CONF_UNSET;
conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.local = NGX_CONF_UNSET_PTR;
@ -1167,6 +1175,9 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->upstream.ignore_client_abort, ngx_conf_merge_value(conf->upstream.ignore_client_abort,
prev->upstream.ignore_client_abort, 0); prev->upstream.ignore_client_abort, 0);
ngx_conf_merge_value(conf->upstream.force_ranges,
prev->upstream.force_ranges, 0);
ngx_conf_merge_ptr_value(conf->upstream.local, ngx_conf_merge_ptr_value(conf->upstream.local,
prev->upstream.local, NULL); prev->upstream.local, NULL);

11
src/http/modules/ngx_http_uwsgi_module.c
View File

@ -238,6 +238,13 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
offsetof(ngx_http_uwsgi_loc_conf_t, upstream.busy_buffers_size_conf), offsetof(ngx_http_uwsgi_loc_conf_t, upstream.busy_buffers_size_conf),
NULL }, NULL },
{ ngx_string("uwsgi_force_ranges"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_uwsgi_loc_conf_t, upstream.force_ranges),
NULL },
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
{ ngx_string("uwsgi_cache"), { ngx_string("uwsgi_cache"),
@ -1271,6 +1278,7 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf)
conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT;
conf->upstream.buffering = NGX_CONF_UNSET; conf->upstream.buffering = NGX_CONF_UNSET;
conf->upstream.ignore_client_abort = NGX_CONF_UNSET; conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
conf->upstream.force_ranges = NGX_CONF_UNSET;
conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.local = NGX_CONF_UNSET_PTR;
@ -1354,6 +1362,9 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->upstream.ignore_client_abort, ngx_conf_merge_value(conf->upstream.ignore_client_abort,
prev->upstream.ignore_client_abort, 0); prev->upstream.ignore_client_abort, 0);
ngx_conf_merge_value(conf->upstream.force_ranges,
prev->upstream.force_ranges, 0);
ngx_conf_merge_ptr_value(conf->upstream.local, ngx_conf_merge_ptr_value(conf->upstream.local,
prev->upstream.local, NULL); prev->upstream.local, NULL);

15
src/http/ngx_http_upstream.c
View File

@ -2276,6 +2276,17 @@ ngx_http_upstream_process_headers(ngx_http_request_t *r, ngx_http_upstream_t *u)
r->disable_not_modified = !u->cacheable; r->disable_not_modified = !u->cacheable;
if (u->conf->force_ranges) {
r->allow_ranges = 1;
r->single_range = 1;
#if (NGX_HTTP_CACHE)
if (r->cached) {
r->single_range = 0;
}
#endif
}
u->length = -1; u->length = -1;
return NGX_OK; return NGX_OK;
@ -4393,6 +4404,10 @@ ngx_http_upstream_copy_allow_ranges(ngx_http_request_t *r,
{ {
ngx_table_elt_t *ho; ngx_table_elt_t *ho;
if (r->upstream->conf->force_ranges) {
return NGX_OK;
}
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
if (r->cached) { if (r->cached) {

1
src/http/ngx_http_upstream.h
View File

@ -162,6 +162,7 @@ typedef struct {
ngx_flag_t ignore_client_abort; ngx_flag_t ignore_client_abort;
ngx_flag_t intercept_errors; ngx_flag_t intercept_errors;
ngx_flag_t cyclic_temp_file; ngx_flag_t cyclic_temp_file;
ngx_flag_t force_ranges;
ngx_path_t *temp_path; ngx_path_t *temp_path;