Mercurial > hg > nginx
comparison src/http/modules/ngx_http_scgi_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 |
---|---|
179 { ngx_string("scgi_busy_buffers_size"), | 179 { ngx_string("scgi_busy_buffers_size"), |
180 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, | 180 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
181 ngx_conf_set_size_slot, | 181 ngx_conf_set_size_slot, |
182 NGX_HTTP_LOC_CONF_OFFSET, | 182 NGX_HTTP_LOC_CONF_OFFSET, |
183 offsetof(ngx_http_scgi_loc_conf_t, upstream.busy_buffers_size_conf), | 183 offsetof(ngx_http_scgi_loc_conf_t, upstream.busy_buffers_size_conf), |
184 NULL }, | |
185 | |
186 { ngx_string("scgi_force_ranges"), | |
187 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, | |
188 ngx_conf_set_flag_slot, | |
189 NGX_HTTP_LOC_CONF_OFFSET, | |
190 offsetof(ngx_http_scgi_loc_conf_t, upstream.force_ranges), | |
184 NULL }, | 191 NULL }, |
185 | 192 |
186 #if (NGX_HTTP_CACHE) | 193 #if (NGX_HTTP_CACHE) |
187 | 194 |
188 { ngx_string("scgi_cache"), | 195 { ngx_string("scgi_cache"), |
1089 conf->upstream.store = NGX_CONF_UNSET; | 1096 conf->upstream.store = NGX_CONF_UNSET; |
1090 conf->upstream.store_access = NGX_CONF_UNSET_UINT; | 1097 conf->upstream.store_access = NGX_CONF_UNSET_UINT; |
1091 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; | 1098 conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; |
1092 conf->upstream.buffering = NGX_CONF_UNSET; | 1099 conf->upstream.buffering = NGX_CONF_UNSET; |
1093 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; | 1100 conf->upstream.ignore_client_abort = NGX_CONF_UNSET; |
1101 conf->upstream.force_ranges = NGX_CONF_UNSET; | |
1094 | 1102 |
1095 conf->upstream.local = NGX_CONF_UNSET_PTR; | 1103 conf->upstream.local = NGX_CONF_UNSET_PTR; |
1096 | 1104 |
1097 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; | 1105 conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; |
1098 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; | 1106 conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; |
1164 ngx_conf_merge_value(conf->upstream.buffering, | 1172 ngx_conf_merge_value(conf->upstream.buffering, |
1165 prev->upstream.buffering, 1); | 1173 prev->upstream.buffering, 1); |
1166 | 1174 |
1167 ngx_conf_merge_value(conf->upstream.ignore_client_abort, | 1175 ngx_conf_merge_value(conf->upstream.ignore_client_abort, |
1168 prev->upstream.ignore_client_abort, 0); | 1176 prev->upstream.ignore_client_abort, 0); |
1177 | |
1178 ngx_conf_merge_value(conf->upstream.force_ranges, | |
1179 prev->upstream.force_ranges, 0); | |
1169 | 1180 |
1170 ngx_conf_merge_ptr_value(conf->upstream.local, | 1181 ngx_conf_merge_ptr_value(conf->upstream.local, |
1171 prev->upstream.local, NULL); | 1182 prev->upstream.local, NULL); |
1172 | 1183 |
1173 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, | 1184 ngx_conf_merge_msec_value(conf->upstream.connect_timeout, |