Fix unknown compress type

Author: NathanFreeman

ext-src/swoole_http_request.cc

@@ -813,45 +813,51 @@ static int http_request_message_complete(swoole_http_parser *parser) {
 
 #ifdef SW_HAVE_COMPRESSION
 void HttpContext::set_compression_method(const char *accept_encoding, size_t length) {
-#ifdef SW_HAVE_BROTLI
-    if (swoole_strnpos(accept_encoding, length, ZEND_STRL("br")) >= 0) {
-        accept_compression = 1;
-        compression_method = HTTP_COMPRESS_BR;
-    } else
-#endif
-        if (swoole_strnpos(accept_encoding, length, ZEND_STRL("gzip")) >= 0) {
+#ifdef SW_HAVE_ZLIB
+    if (swoole_strnpos(accept_encoding, length, ZEND_STRL("gzip")) >= 0) {
         accept_compression = 1;
         compression_method = HTTP_COMPRESS_GZIP;
     } else if (swoole_strnpos(accept_encoding, length, ZEND_STRL("deflate")) >= 0) {
         accept_compression = 1;
         compression_method = HTTP_COMPRESS_DEFLATE;
+    } else
+#endif
+#ifdef SW_HAVE_BROTLI
+        if (swoole_strnpos(accept_encoding, length, ZEND_STRL("br")) >= 0) {
+        accept_compression = 1;
+        compression_method = HTTP_COMPRESS_BR;
+    } else
+#endif
 #ifdef SW_HAVE_ZSTD
-    } else if (swoole_strnpos(accept_encoding, length, ZEND_STRL("zstd")) >= 0) {
+        if (swoole_strnpos(accept_encoding, length, ZEND_STRL("zstd")) >= 0) {
         accept_compression = 1;
         compression_method = HTTP_COMPRESS_ZSTD;
+    } else
 #endif
-    } else {
+    {
         accept_compression = 0;
     }
 }
 
 const char *HttpContext::get_content_encoding() {
+#ifdef SW_HAVE_ZLIB
     if (compression_method == HTTP_COMPRESS_GZIP) {
         return "gzip";
     } else if (compression_method == HTTP_COMPRESS_DEFLATE) {
         return "deflate";
-    }
+    } else
+#endif
 #ifdef SW_HAVE_BROTLI
-    else if (compression_method == HTTP_COMPRESS_BR) {
+        if (compression_method == HTTP_COMPRESS_BR) {
         return "br";
-    }
+    } else
 #endif
 #ifdef SW_HAVE_ZSTD
-    else if (compression_method == HTTP_COMPRESS_ZSTD) {
+        if (compression_method == HTTP_COMPRESS_ZSTD) {
         return "zstd";
-    }
+    } else
 #endif
-    else {
+    {
         return nullptr;
     }
 }

scripts/library.sh

@@ -6,7 +6,7 @@ else
 fi
 
 apt update
-apt install -y cmake make gcc libssl-dev libmariadb-dev unixodbc-dev libaio-dev libaio1 sqlite3 libsqlite3-dev libzstd-dev
+apt install -y cmake make gcc libssl-dev libmariadb-dev unixodbc-dev libaio-dev libaio1 sqlite3 libsqlite3-dev libzstd-dev zlib1g-dev
 wget https://github.com/mariadb-corporation/mariadb-connector-odbc/archive/refs/tags/3.1.21.tar.gz
 tar zxf 3.1.21.tar.gz
 mkdir build

tests/swoole_http_server/accept_encoding.phpt

@@ -0,0 +1,63 @@
+--TEST--
+swoole_http_server: accept encoding type
+--SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+
+use Swoole\Http\Server;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+use Swoole\Runtime;
+use function Swoole\Coroutine\run;
+
+function curl_request(string $type, string $url) {
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, ["Accept-Encoding: {$type}"]);
+    curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($ch, $headerLine) use ($type) {
+        if (stripos($headerLine, 'Content-Encoding:') !== false) {
+            Assert::true(stripos($headerLine, $type) !== false);
+        }
+        return strlen($headerLine);
+    });
+    curl_exec($ch);
+    curl_close($ch);
+}
+
+$pm = new ProcessManager;
+$pm->parentFunc = function () use ($pm)
+{
+    Runtime::enableCoroutine(SWOOLE_HOOK_NATIVE_CURL);
+    run(function () use ($pm) {
+        $url = "http://127.0.0.1:".$pm->getFreePort();
+        curl_request('br', $url);
+        curl_request('gzip', $url);
+        curl_request('deflate', $url);
+        curl_request('zstd', $url);
+    });
+    $pm->kill();
+};
+
+$pm->childFunc = function () use ($pm)
+{
+    $http = new Server('127.0.0.1', $pm->getFreePort(), SWOOLE_BASE, SWOOLE_SOCK_TCP);
+    $http->set([
+        'http_compression' => true,
+    ]);
+    $http->on("WorkerStart", function ($serv, $wid) {
+        global $pm;
+        $pm->wakeup();
+    });
+    $http->on("request", function (Request $request, Response $response) {
+        $response->end(co::readFile(__DIR__ . '/../../README.md'));
+    });
+    $http->start();
+};
+
+$pm->childFirst();
+$pm->run();
+?>
+--EXPECT--

tests/swoole_http_server/bug_2947.phpt

@@ -12,14 +12,14 @@ $pm->parentFunc = function () use ($pm) {
         $headers = httpGetHeaders(
             "http://127.0.0.1:{$pm->getFreePort()}",
             [
-                'headers' => ['Accept-Encoding' => 'gzip, br'],
+                'headers' => ['Accept-Encoding' => 'gzip, '],
                 'data' => $pm->getRandomData()
             ]
         );
         $encoding = $headers['content-encoding'] ?? '';
-        if (defined('SWOOLE_HAVE_BROTLI')) {
+        if (defined('SWOOLE_HAVE_ZLIB')) {
             Assert::same($encoding, 'br');
-        } elseif (defined('SWOOLE_HAVE_ZLIB')) {
+        } elseif (defined('SWOOLE_HAVE_BROTLI')) {
             Assert::same($encoding, 'gzip');
         }
         if (defined('SWOOLE_HAVE_COMPRESSION')) {