IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-01-07 14:43:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Now unsatisfiable ranges are processed according to RFC 2616.

Browse Source
This commit is contained in:
Igor Sysoev 2011-08-30 13:01:55 +00:00
parent 584703b84a
commit 451df22b3f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,7 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx)
} }
if (start >= r->headers_out.content_length_n) { if (start >= r->headers_out.content_length_n) {
return NGX_HTTP_RANGE_NOT_SATISFIABLE; goto skip;
} }
while (*p == ' ') { p++; } while (*p == ' ') { p++; }
@ -299,14 +299,10 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx)
} }
if (start > end) { if (start > end) {
return NGX_HTTP_RANGE_NOT_SATISFIABLE; goto skip;
} }
if (end >= r->headers_out.content_length_n) { if (end >= r->headers_out.content_length_n) {
/*
* Download Accelerator sends the last byte position
* that equals to the file length
*/
end = r->headers_out.content_length_n; end = r->headers_out.content_length_n;
} else { } else {
@ -325,11 +321,17 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx)
size += end - start; size += end - start;
skip:
if (*p++ != ',') { if (*p++ != ',') {
break; break;
} }
} }
if (ctx->ranges.nelts == 0) {
return NGX_HTTP_RANGE_NOT_SATISFIABLE;
}
if (size > r->headers_out.content_length_n) { if (size > r->headers_out.content_length_n) {
return NGX_DECLINED; return NGX_DECLINED;
} }