commit 451df22b3f07d4e11ea8b32cc932630ae383d280
author Igor Sysoev <igor@sysoev.ru> Tue Aug 30 13:01:55 2011 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Aug 30 13:01:55 2011 +0000
tree 7afb6fc9dfd75aac08b5fc8a216aa89d53f53ffb
parent 584703b84a3dff36e7127c555248f9d024179f06

Now unsatisfiable ranges are processed according to RFC 2616.

src/http/modules/ngx_http_range_filter_module.c

diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c
index c0a835c..6b45e2b 100644
--- a/src/http/modules/ngx_http_range_filter_module.c
+++ b/src/http/modules/ngx_http_range_filter_module.c
@@ -264,7 +264,7 @@
             }
 
             if (start >= r->headers_out.content_length_n) {
-                return NGX_HTTP_RANGE_NOT_SATISFIABLE;
+                goto skip;
             }
 
             while (*p == ' ') { p++; }
@@ -299,14 +299,10 @@
         }
 
         if (start > end) {
-            return NGX_HTTP_RANGE_NOT_SATISFIABLE;
+            goto skip;
         }
 
         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 {
@@ -325,11 +321,17 @@
 
         size += end - start;
 
+    skip:
+
         if (*p++ != ',') {
             break;
         }
     }
 
+    if (ctx->ranges.nelts == 0) {
+        return NGX_HTTP_RANGE_NOT_SATISFIABLE;
+    }
+
     if (size > r->headers_out.content_length_n) {
         return NGX_DECLINED;
     }