nginx: src/http/modules/ngx_http_range_filter

Ranges processing small optimization.

comparison

equal deleted inserted replaced

-:e9213133993a
+:3205a6d6c6ec
 ngx_int_t
 ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx)
 {
 u_char            *p;
-off_t              start, end, size;
+off_t              start, end, size, content_length;
 ngx_uint_t         suffix;
 ngx_http_range_t  *range;
 p = r->headers_in.range->value.data + 6;
 size = 0;
+content_length = r->headers_out.content_length_n;
 for ( ;; ) {
 start = 0;
 end = 0;
 suffix = 0;
 if (*p++ != '-') {
 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
 }
-if (start >= r->headers_out.content_length_n) {
+if (start >= content_length) {
 goto skip;
 }
 while (*p == ' ') { p++; }
 if (*p == ',' || *p == '\0') {
-end = r->headers_out.content_length_n;
+end = content_length;
 goto found;
 }
 } else {
 suffix = 1;
 if (*p != ',' && *p != '\0') {
 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
 }
 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) {
 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 {
 end++;
 }
 if (ctx->ranges.nelts == 0) {
 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
 }
-if (size > r->headers_out.content_length_n) {
+if (size > content_length) {
 return NGX_DECLINED;
 }
 return NGX_OK;
 }

Mercurial > hg > nginx