Merge pull request zendframework/zendframework#3039 branch 'hotfix/combine-conditional'

Maks3w · Maks3w · commit 03ab3c88fcc7 · 2012-11-21T21:28:59.000+01:00
diff --git a/src/PhpEnvironment/Response.php b/src/PhpEnvironment/Response.php
@@ -61,10 +61,8 @@ public function getVersion()
      */
     protected function detectVersion()
     {
-        if (isset($_SERVER['SERVER_PROTOCOL'])) {
-            if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
-                return self::VERSION_11;
-            }
+        if (isset($_SERVER['SERVER_PROTOCOL']) && $_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {
+            return self::VERSION_11;
         }
 
         return self::VERSION_10;

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,8 @@ public function getVersion()`
`61`	`61`	`*/`
`62`	`62`	`protected function detectVersion()`
`63`	`63`	`{`
`64`		`- if (isset($_SERVER['SERVER_PROTOCOL'])) {`
`65`		`- if ($_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {`
`66`		`- return self::VERSION_11;`
`67`		`- }`
	`64`	`+ if (isset($_SERVER['SERVER_PROTOCOL']) && $_SERVER['SERVER_PROTOCOL'] == 'HTTP/1.1') {`
	`65`	`+ return self::VERSION_11;`
`68`	`66`	`}`
`69`	`67`
`70`	`68`	`return self::VERSION_10;`