From c4e22b1085fb41a31e7e87ff80d3cc1c0fd8b332 Mon Sep 17 00:00:00 2001
From: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
Date: Tue, 31 Oct 2023 18:25:35 +0000
Subject: [PATCH 1/2] Fix warning when cookie is null

---
 src/Appwrite/Utopia/Request.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Appwrite/Utopia/Request.php b/src/Appwrite/Utopia/Request.php
index a9eef62e06..cb877afad4 100644
--- a/src/Appwrite/Utopia/Request.php
+++ b/src/Appwrite/Utopia/Request.php
@@ -107,6 +107,10 @@ class Request extends UtopiaRequest
     {
         $headers = $this->generateHeaders();
 
+        if (empty($this->swoole->cookie)) {
+            return $headers;
+        }
+
         $cookieHeaders = [];
         foreach ($this->swoole->cookie as $key => $value) {
             $cookieHeaders[] = "{$key}={$value}";

From 7c8a9ad4d2f09de93e2b31ffbbb56a725a786e70 Mon Sep 17 00:00:00 2001
From: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
Date: Tue, 31 Oct 2023 18:31:36 +0000
Subject: [PATCH 2/2] Fix incorrect general_protocol_unsupported error

$requestHeaders was being referenced before it was set. This PR reverts
code back to using $swooleRequest to extract the header.
---
 app/controllers/general.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/general.php b/app/controllers/general.php
index 247669731a..cf383b6710 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -408,7 +408,7 @@ App::init()
         * @see https://www.owasp.org/index.php/List_of_useful_HTTP_headers
         */
         if (App::getEnv('_APP_OPTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
-            if ($request->getProtocol() !== 'https' && ($requestHeaders['host'] ?? '') !== 'localhost' && ($requestHeaders['host'] ?? '') !== APP_HOSTNAME_INTERNAL) { // localhost allowed for proxy, APP_HOSTNAME_INTERNAL allowed for migrations
+            if ($request->getProtocol() !== 'https' && ($swooleRequest->header['host'] ?? '') !== 'localhost' && ($swooleRequest->header['host'] ?? '') !== APP_HOSTNAME_INTERNAL) { // localhost allowed for proxy, APP_HOSTNAME_INTERNAL allowed for migrations
                 if ($request->getMethod() !== Request::METHOD_GET) {
                     throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
                 }