Merge pull request #386 from rokclimb15/serverurl-helper-x-forwarded-…

…proto Support X-Forwarded-Proto header
Shardj · Oct 26, 2023 · e90fae7 · e90fae7
2 parents 74ce53b + fa81714
commit e90fae7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/library/Zend/View/Helper/ServerUrl.php b/library/Zend/View/Helper/ServerUrl.php
@@ -56,6 +56,7 @@ public function __construct()
             case (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] === true)):
             case (isset($_SERVER['HTTP_SCHEME']) && ($_SERVER['HTTP_SCHEME'] == 'https')):
             case (isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] == 443)):
+            case (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')):
                 $scheme = 'https';
                 break;
             default:

diff --git a/tests/Zend/View/Helper/ServerUrlTest.php b/tests/Zend/View/Helper/ServerUrlTest.php
@@ -53,6 +53,7 @@ protected function set_up()
     {
         $this->_serverBackup = $_SERVER;
         unset($_SERVER['HTTPS']);
+        unset($_SERVER['HTTP_X_FORWARDED_PROTO']);
     }
 
     /**
@@ -88,6 +89,15 @@ public function testConstructorWithHostAndHttpsOn()
         $this->assertEquals('https://example.com', $url->serverUrl());
     }
 
+    public function testConstructorWithHostAndXForwardedProtoHttps()
+    {
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['HTTP_X_FORWARDED_PROTO'] = 'https';
+
+        $url = new Zend_View_Helper_ServerUrl();
+        $this->assertEquals('https://example.com', $url->serverUrl());
+    }
+
     public function testConstructorWithHostAndHttpsTrue()
     {
         $_SERVER['HTTP_HOST'] = 'example.com';