Merge branch '1.x' into 2.x

craftcms · May 15, 2024 · 1b1e4ab · 1b1e4ab
2 parents a070c99 + 8e8184d
commit 1b1e4ab
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/web/ResponseEventHandler.php b/src/web/ResponseEventHandler.php
@@ -12,11 +12,10 @@
 use yii\web\Response as YiiResponse;
 use yii\web\ServerErrorHttpException;
 
-/**
- * @property Response $response
- */
 class ResponseEventHandler
 {
+    protected Response $response;
+
     public function __construct()
     {
         $this->response = Craft::$app->getResponse();
@@ -38,7 +37,7 @@ public function gzip(): void
             Craft::$app->getRequest()->getHeaders()->get('Accept-Encoding') ?? ''
         );
 
-        if (Collection::make($accepts)->doesntContain('gzip')) {
+        if (Collection::make($accepts)->doesntContain('gzip') || $this->response->content === null) {
             return;
         }