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

Ranges processing small optimization.

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

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

@ -234,12 +234,13 @@ 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)
{ {
u_char *p; u_char *p;
off_t start, end, size; off_t start, end, size, content_length;
ngx_uint_t suffix; ngx_uint_t suffix;
ngx_http_range_t *range; ngx_http_range_t *range;
p = r->headers_in.range->value.data + 6; p = r->headers_in.range->value.data + 6;
size = 0; size = 0;
content_length = r->headers_out.content_length_n;
for ( ;; ) { for ( ;; ) {
start = 0; start = 0;
@ -263,14 +264,14 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx)
return NGX_HTTP_RANGE_NOT_SATISFIABLE; return NGX_HTTP_RANGE_NOT_SATISFIABLE;
} }
if (start >= r->headers_out.content_length_n) { if (start >= content_length) {
goto skip; goto skip;
} }
while (*p == ' ') { p++; } while (*p == ' ') { p++; }
if (*p == ',' || *p == '\0') { if (*p == ',' || *p == '\0') {
end = r->headers_out.content_length_n; end = content_length;
goto found; goto found;
} }
@ -294,16 +295,16 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx)
} }
if (suffix) { if (suffix) {
start = r->headers_out.content_length_n - end; start = content_length - end;
end = r->headers_out.content_length_n - 1; end = content_length - 1;
} }
if (start > end) { if (start > end) {
goto skip; goto skip;
} }
if (end >= r->headers_out.content_length_n) { if (end >= content_length) {
end = r->headers_out.content_length_n; end = content_length;
} else { } else {
end++; end++;
@ -332,7 +333,7 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx)
return NGX_HTTP_RANGE_NOT_SATISFIABLE; return NGX_HTTP_RANGE_NOT_SATISFIABLE;
} }
if (size > r->headers_out.content_length_n) { if (size > content_length) {
return NGX_DECLINED; return NGX_DECLINED;
} }