Merge pull request zendframework/zendframework#1562 from SocalNick/ho…

…tfix/request-cookie-handling

Fixing cookie handling in request object

src/PhpEnvironment/Request.php

@@ -57,7 +57,9 @@ public function __construct()
         $this->setPost(new Parameters($_POST));
         $this->setQuery(new Parameters($_GET));
         $this->setServer(new Parameters($_SERVER));
-        $this->setCookies(new Parameters($_COOKIE));
+        if ($_COOKIE) {
+            $this->setCookies(new Parameters($_COOKIE));
+        }
 
         if ($_FILES) {
             $this->setFile(new Parameters($_FILES));
@@ -236,6 +238,10 @@ protected function serverToHeaders($server)
 
         foreach ($server as $key => $value) {
             if ($value && strpos($key, 'HTTP_') === 0) {
+                if (strpos($key, 'HTTP_COOKIE') === 0) {
+                    // Cookies are handled using the $_COOKIE superglobal
+                    continue;
+                }
                 $name = strtr(substr($key, 5), '_', ' ');
                 $name = strtr(ucwords(strtolower($name)), ' ', '-');
             } elseif ($value && strpos($key, 'CONTENT_') === 0) {