Skip to content

Commit

Permalink
Apply OM-1081-patch
Browse files Browse the repository at this point in the history
  • Loading branch information
sreichel committed Jul 25, 2024
1 parent fd738d3 commit 2429f02
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 7 deletions.
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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"
}
},
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -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;
}

/**

0 comments on commit 2429f02

Please sign in to comment.