From 2429f02f63dfb7b0d4b93a9287a218b87363c7ab Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Thu, 25 Jul 2024 20:25:37 +0200
Subject: [PATCH] Apply OM-1081-patch

---
 composer.json                                       | 12 ++++++------
 composer.lock                                       |  2 +-
 ...y-zend-controller-request-http-php-OM-1081.patch | 13 +++++++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 patches/zf1s-zend-controller-library-zend-controller-request-http-php-OM-1081.patch

diff --git a/composer.json b/composer.json
index 68ef3ba93db..4fc7acef9a8 100644
--- a/composer.json
+++ b/composer.json
@@ -122,6 +122,12 @@
     },
     "extra": {
         "patches": {
+            "zf1s/zend-controller": {
+                "FI1": "patches/zf1s-zend-controller-library-zend-controller-request-abstract-php-fluent-interface.patch",
+                "FI2": "patches/zf1s-zend-controller-library-zend-controller-response-abstract-php-fluent-interface.patch",
+                "FI3": "patches/zf1s-zend-controller-library-zend-controller-request-http-php-fluent-interface.patch",
+                "OM-1081 - Not detecting HTTPS behind a proxy": "patches/zf1s-zend-controller-library-zend-controller-request-http-php-OM-1081.patch"
+            },
             "zf1s/zend-date": {
                 "OM-2050 - Prevent checking known date codes": "patches/zf1s-zend-date-library-zend-date-php-OM-2050.patch"
             },
@@ -138,14 +144,8 @@
                 "patches/zf1s-zend-db-library-zend-db-adapter-abstract-php-return-type.patch",
                 "patches/zf1s-zend-db-library-zend-db-select-php-fluent-interface.patch"
             ],
-            "zf1s/zend-controller": [
-                "patches/zf1s-zend-controller-library-zend-controller-response-abstract-php-fluent-interface.patch",
-                "patches/zf1s-zend-controller-library-zend-controller-request-http-php-fluent-interface.patch",
-                "patches/zf1s-zend-controller-library-zend-controller-request-abstract-php-fluent-interface.patch"
-            ],
             "shardj/zf1-future": {
                 "OM-918 - Add runtime cache to Zend_Locale_Data": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-918.patch",
-                "OM-1081 - Not detecting HTTPS behind a proxy": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-1081.patch",
                 "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2047.patch"
             }
         },
diff --git a/composer.lock b/composer.lock
index fcd21c7f631..afb88989675 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6554b52dc43eb4d88b702e2e2c9f3f4b",
+    "content-hash": "5442fb74f9f7e2dbc156689410afcbca",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-redis",
diff --git a/patches/zf1s-zend-controller-library-zend-controller-request-http-php-OM-1081.patch b/patches/zf1s-zend-controller-library-zend-controller-request-http-php-OM-1081.patch
new file mode 100644
index 00000000000..e0c2ce362bb
--- /dev/null
+++ b/patches/zf1s-zend-controller-library-zend-controller-request-http-php-OM-1081.patch
@@ -0,0 +1,13 @@
+--- /dev/null
++++ ../library/Zend/Controller/Request/Http.php
+@@ -1040,7 +1040,9 @@
+      */
+     public function getScheme()
+     {
+-        return ($this->getServer('HTTPS') == 'on') ? self::SCHEME_HTTPS : self::SCHEME_HTTP;
++        return (strtolower((string)$this->getServer('HTTPS')) == 'on') || $this->getServer('HTTP_X_FORWARDED_PROTO') == 'https' ?
++            self::SCHEME_HTTPS :
++            self::SCHEME_HTTP;
+     }
+ 
+     /**