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

Ranges processing small optimization.

Browse Source
This commit is contained in:
Igor Sysoev 2011-08-30 12:45:24 +00:00
parent f2575bd878
commit 584703b84a
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,20 +270,8 @@ ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx)
while (*p == ' ') { p++; } while (*p == ' ') { p++; }
if (*p == ',' || *p == '\0') { if (*p == ',' || *p == '\0') {
range = ngx_array_push(&ctx->ranges); end = r->headers_out.content_length_n;
if (range == NULL) { goto found;
return NGX_ERROR;
}
range->start = start;
range->end = r->headers_out.content_length_n;
size += range->end - start;
if (*p++ != ',') {
break;
}
continue;
} }
} else { } else {
@ -314,25 +302,28 @@ 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 (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;
} else {
end++;
}
found:
range = ngx_array_push(&ctx->ranges); range = ngx_array_push(&ctx->ranges);
if (range == NULL) { if (range == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
range->start = start; range->start = start;
range->end = end;
if (end >= r->headers_out.content_length_n) { size += end - start;
/*
* Download Accelerator sends the last byte position
* that equals to the file length
*/
range->end = r->headers_out.content_length_n;
} else {
range->end = end + 1;
}
size += range->end - start;
if (*p++ != ',') { if (*p++ != ',') {
break; break;