Merge pull request #155 from utopia-php/fix-prevent-duplicate-compres…

…sion fix: duplicate compression
utopia-php · Feb 24, 2025 · 81f4a3f · 81f4a3f
2 parents e91d4c5 + a1efe3e
commit 81f4a3f
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 91 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Response.php b/src/Response.php
@@ -196,21 +196,21 @@ class Response
         'text/x-component' => true,
         'text/x-java-source' => true,
         'text/x-markdown' => true,
-        
+
         // JavaScript
         'application/javascript' => true,
         'application/x-javascript' => true,
         'text/javascript' => true,
         'text/js' => true,
-        
+
         // Icons
         'image/x-icon' => true,
         'image/vnd.microsoft.icon' => true,
-        
+
         // Scripts
         'application/x-perl' => true,
         'application/x-httpd-cgi' => true,
-        
+
         // XML and JSON
         'text/xml' => true,
         'application/xml' => true,
@@ -222,14 +222,14 @@ class Response
         'application/ld+json' => true,
         'application/graphql+json' => true,
         'application/geo+json' => true,
-        
+
         // Multipart
         'multipart/bag' => true,
         'multipart/mixed' => true,
-        
+
         // XHTML
         'application/xhtml+xml' => true,
-        
+
         // Fonts
         'font/ttf' => true,
         'font/otf' => true,
@@ -247,7 +247,7 @@ class Response
         'application/eot' => true,
         'application/font' => true,
         'application/font-sfnt' => true,
-        
+
         // WebAssembly
         'application/wasm' => true,
         'application/javascript-binast' => true,
@@ -598,8 +598,9 @@ public function send(string $body = ''): void
 
         $this->appendCookies();
 
-        // Compress body
+        // Compress body only if all conditions are met:
         if (
+            empty($this->headers['content-encoding']) &&
             !empty($this->acceptEncoding) &&
             $this->isCompressible($this->contentType) &&
             strlen($body) > $this->compressionMinSize

diff --git a/tests/Validator/DomainTest.php b/tests/Validator/DomainTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Utopia PHP Framework
  *

diff --git a/tests/Validator/HostTest.php b/tests/Validator/HostTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Utopia PHP Framework
  *

diff --git a/tests/Validator/IPTest.php b/tests/Validator/IPTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Utopia PHP Framework
  *

diff --git a/tests/Validator/URLTest.php b/tests/Validator/URLTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Utopia PHP Framework
  *
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
     /**
      * Utopia PHP Framework
      *
@@ Expand Down @@