Fixed there is no Content-Range response header when the range reques…

…t returns all the contents of the file (#5203)
swoole · Dec 26, 2023 · 828de1d · 828de1d
1 parent 0063406
commit 828de1d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/ext-src/swoole_http2_server.cc b/ext-src/swoole_http2_server.cc
@@ -211,17 +211,19 @@ static bool http2_server_is_static_file(Server *serv, HttpContext *ctx) {
         ctx->response.status = handler.status_code;
         auto tasks = handler.get_tasks();
         if (1 == tasks.size()) {
-            if (0 == tasks[0].offset && tasks[0].length == handler.get_filesize()) {
-                ctx->set_header(ZEND_STRL("Accept-Ranges"), SW_STRL("bytes"), 0);
-            } else {
+            if (SW_HTTP_PARTIAL_CONTENT == handler.status_code) {
                 std::stringstream content_range;
-                content_range << "bytes";
-                if (tasks[0].length != handler.get_filesize()) {
-                    content_range << " " << tasks[0].offset << "-" << (tasks[0].length + tasks[0].offset - 1) << "/"
-                                  << handler.get_filesize();
-                }
+                content_range << "bytes "
+                              << tasks[0].offset
+                              << "-"
+                              << (tasks[0].length + tasks[0].offset - 1)
+                              << "/"
+                              << handler.get_filesize()
+                              << "\r\n";
                 auto content_range_str = content_range.str();
                 ctx->set_header(ZEND_STRL("Content-Range"), content_range_str.c_str(), content_range_str.length(), 0);
+            } else {
+                ctx->set_header(ZEND_STRL("Accept-Ranges"), SW_STRL("bytes"), 0);
             }
         }
 

diff --git a/src/protocol/http.cc b/src/protocol/http.cc
@@ -139,15 +139,16 @@ bool Server::select_static_handler(http_server::Request *request, Connection *co
 
     std::stringstream header_stream;
     if (1 == tasks.size()) {
-        if (0 == tasks[0].offset && tasks[0].length == handler.get_filesize()) {
-            header_stream << "Accept-Ranges: bytes\r\n";
+        if (SW_HTTP_PARTIAL_CONTENT == handler.status_code) {
+            header_stream << "Content-Range: bytes "
+                          << tasks[0].offset
+                          << "-"
+                          << (tasks[0].length + tasks[0].offset - 1)
+                          << "/"
+                          << handler.get_filesize()
+                          << "\r\n";
         } else {
-            header_stream << "Content-Range: bytes";
-            if (tasks[0].length != handler.get_filesize()) {
-                header_stream << " " << tasks[0].offset << "-" << (tasks[0].length + tasks[0].offset - 1) << "/"
-                              << handler.get_filesize();
-            }
-            header_stream << "\r\n";
+            header_stream << "Accept-Ranges: bytes\r\n";
         }
     }
 

diff --git a/tests/swoole_http_server/range.phpt b/tests/swoole_http_server/range.phpt
@@ -24,6 +24,11 @@ $pm->parentFunc = function () use ($pm) {
             $lastModified = $response['headers']['last-modified'] ?? null;
             Assert::notNull($lastModified);
             Assert::null($response['headers']['accept-ranges'] ?? null);
+            $response = httpRequest("http://127.0.0.1:{$pm->getFreePort()}/test.jpg", ['http2' => $http2, 'headers' => ['Range' => 'bytes=0-']]);
+            Assert::same($response['statusCode'], 206);
+            Assert::same('bytes 0-218786/218787', $response['headers']['content-range']);
+            Assert::same(bin2hex($response['body']), bin2hex($data2));
+            // exit;
             $response = httpRequest("http://127.0.0.1:{$pm->getFreePort()}/test.jpg", ['http2' => $http2, 'headers' => ['Range' => 'bytes=16-31']]);
             Assert::same($response['statusCode'], 206);
             Assert::same('bytes 16-31/218787', $response['headers']['content-range']);