Merge branch 'hotfix/zendframework/zendframework#6896-ibmi-https-flag…

…s-in-environment-request' into develop Close zendframework/zendframework#6896 Forward port zendframework/zendframework#6896
zendframework · Dec 16, 2014 · 2746aff · 2746aff
4 parents 21406ca + c7ed528 + 4f4e25c + 114d8ac
commit 2746aff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/PhpEnvironment/Request.php b/src/PhpEnvironment/Request.php
@@ -251,7 +251,7 @@ public function setServer(ParametersInterface $server)
         $uri = new HttpUri();
 
         // URI scheme
-        if ((!empty($this->serverParams['HTTPS']) && $this->serverParams['HTTPS'] !== 'off')
+        if ((!empty($this->serverParams['HTTPS']) && strtolower($this->serverParams['HTTPS']) !== 'off')
             || (!empty($this->serverParams['HTTP_X_FORWARDED_PROTO']) && $this->serverParams['HTTP_X_FORWARDED_PROTO'] == 'https')
         ) {
             $scheme = 'https';

diff --git a/test/PhpEnvironment/RequestTest.php b/test/PhpEnvironment/RequestTest.php
@@ -772,4 +772,16 @@ public function testAllowCustomMethodsFlagCanBeSetWithConstructor()
 
         $request = new Request(false);
     }
+
+    /**
+     * @group 6896
+     */
+    public function testHandlesUppercaseHttpsFlags()
+    {
+        $_SERVER['HTTPS'] = 'OFF';
+
+        $request = new Request();
+
+        $this->assertSame('http', $request->getUri()->getScheme());
+    }
 }