mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

The "max_ranges" directive.

Browse Source 
"max_ranges 0" disables ranges support at all,
"max_ranges 1" allows the single range, etc.
By default number of ranges is unlimited, to be precise, 2^31-1.
This commit is contained in:
Igor Sysoev 2011-08-31 09:40:55 +00:00
parent e81c293289
commit f560419c54
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/http/modules/ngx_http_range_filter_module.c
View File

@ -59,7 +59,7 @@ typedef struct {
static ngx_int_t ngx_http_range_parse(ngx_http_request_t *r, static ngx_int_t ngx_http_range_parse(ngx_http_request_t *r,
ngx_http_range_filter_ctx_t *ctx); ngx_http_range_filter_ctx_t *ctx, ngx_uint_t ranges);
static ngx_int_t ngx_http_range_singlepart_header(ngx_http_request_t *r, static ngx_int_t ngx_http_range_singlepart_header(ngx_http_request_t *r,
ngx_http_range_filter_ctx_t *ctx); ngx_http_range_filter_ctx_t *ctx);
static ngx_int_t ngx_http_range_multipart_header(ngx_http_request_t *r, static ngx_int_t ngx_http_range_multipart_header(ngx_http_request_t *r,
@ -146,6 +146,7 @@ static ngx_int_t
ngx_http_range_header_filter(ngx_http_request_t *r) ngx_http_range_header_filter(ngx_http_request_t *r)
{ {
time_t if_range; time_t if_range;
ngx_http_core_loc_conf_t *clcf;
ngx_http_range_filter_ctx_t *ctx; ngx_http_range_filter_ctx_t *ctx;
if (r->http_version < NGX_HTTP_VERSION_10 if (r->http_version < NGX_HTTP_VERSION_10
@ -157,6 +158,12 @@ ngx_http_range_header_filter(ngx_http_request_t *r)
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);
} }
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (clcf->max_ranges == 0) {
return ngx_http_next_header_filter(r);
}
if (r->headers_in.range == NULL if (r->headers_in.range == NULL
|| r->headers_in.range->value.len < 7 || r->headers_in.range->value.len < 7
|| ngx_strncasecmp(r->headers_in.range->value.data, || ngx_strncasecmp(r->headers_in.range->value.data,
@ -191,7 +198,7 @@ ngx_http_range_header_filter(ngx_http_request_t *r)
return NGX_ERROR; return NGX_ERROR;
} }
switch (ngx_http_range_parse(r, ctx)) { switch (ngx_http_range_parse(r, ctx, clcf->max_ranges)) {
case NGX_OK: case NGX_OK:
ngx_http_set_ctx(r, ctx, ngx_http_range_body_filter_module); ngx_http_set_ctx(r, ctx, ngx_http_range_body_filter_module);
@ -231,7 +238,8 @@ next_filter:
static ngx_int_t static ngx_int_t
ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx) ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
ngx_uint_t ranges)
{ {
u_char *p; u_char *p;
off_t start, end, size, content_length; off_t start, end, size, content_length;
@ -314,6 +322,10 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx)
range->end = end; range->end = end;
size += end - start; size += end - start;
if (--ranges == 0) {
break;
}
} }
if (*p++ != ',') { if (*p++ != ',') {

10
src/http/ngx_http_core_module.c
View File

@ -631,6 +631,13 @@ static ngx_command_t ngx_http_core_commands[] = {
offsetof(ngx_http_core_loc_conf_t, if_modified_since), offsetof(ngx_http_core_loc_conf_t, if_modified_since),
&ngx_http_core_if_modified_since }, &ngx_http_core_if_modified_since },
{ ngx_string("max_ranges"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_num_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_core_loc_conf_t, max_ranges),
NULL },
{ ngx_string("chunked_transfer_encoding"), { ngx_string("chunked_transfer_encoding"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_flag_slot, ngx_conf_set_flag_slot,
@ -3253,6 +3260,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
clcf->keepalive_disable = NGX_CONF_UNSET_UINT; clcf->keepalive_disable = NGX_CONF_UNSET_UINT;
clcf->satisfy = NGX_CONF_UNSET_UINT; clcf->satisfy = NGX_CONF_UNSET_UINT;
clcf->if_modified_since = NGX_CONF_UNSET_UINT; clcf->if_modified_since = NGX_CONF_UNSET_UINT;
clcf->max_ranges = NGX_CONF_UNSET_UINT;
clcf->client_body_in_file_only = NGX_CONF_UNSET_UINT; clcf->client_body_in_file_only = NGX_CONF_UNSET_UINT;
clcf->client_body_in_single_buffer = NGX_CONF_UNSET; clcf->client_body_in_single_buffer = NGX_CONF_UNSET;
clcf->internal = NGX_CONF_UNSET; clcf->internal = NGX_CONF_UNSET;
@ -3459,6 +3467,8 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
NGX_HTTP_SATISFY_ALL); NGX_HTTP_SATISFY_ALL);
ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,
NGX_HTTP_IMS_EXACT); NGX_HTTP_IMS_EXACT);
ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges,
0x7fffffff);
ngx_conf_merge_uint_value(conf->client_body_in_file_only, ngx_conf_merge_uint_value(conf->client_body_in_file_only,
prev->client_body_in_file_only, 0); prev->client_body_in_file_only, 0);
ngx_conf_merge_value(conf->client_body_in_single_buffer, ngx_conf_merge_value(conf->client_body_in_single_buffer,

1
src/http/ngx_http_core_module.h
View File

@ -363,6 +363,7 @@ struct ngx_http_core_loc_conf_s {
ngx_uint_t satisfy; /* satisfy */ ngx_uint_t satisfy; /* satisfy */
ngx_uint_t lingering_close; /* lingering_close */ ngx_uint_t lingering_close; /* lingering_close */
ngx_uint_t if_modified_since; /* if_modified_since */ ngx_uint_t if_modified_since; /* if_modified_since */
ngx_uint_t max_ranges; /* max_ranges */
ngx_uint_t client_body_in_file_only; /* client_body_in_file_only */ ngx_uint_t client_body_in_file_only; /* client_body_in_file_only */
ngx_flag_t client_body_in_single_buffer; ngx_flag_t client_body_in_single_buffer;