From 7d2acfc6d4da5a7d3259378cff8cc73788a28fbf Mon Sep 17 00:00:00 2001
From: Anup Dugar <anup@x.com>
Date: Mon, 9 Feb 2015 08:41:08 -0600
Subject: [PATCH] MAGETWO-31613: [GITHUB] Magento API fails in a CGI env (zf1
 issue) #790

- Upgraded zf1 from 1.12.9 to 1.12.10
- Removed patched fix from Zend_Controller_Request_Http::getHeader since zf 1.12.10 has the actual fix
---
 app/code/Magento/Webapi/Controller/Request.php | 18 ------------------
 composer.json                                  |  2 +-
 composer.lock                                  | 13 +++++++------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/Webapi/Controller/Request.php b/app/code/Magento/Webapi/Controller/Request.php
index 2e845d6a579f6..cc262a3a8ae90 100644
--- a/app/code/Magento/Webapi/Controller/Request.php
+++ b/app/code/Magento/Webapi/Controller/Request.php
@@ -52,22 +52,4 @@ public function getCookie($name = null, $default = null)
     {
         return $this->_cookieReader->getCookie($name, $default);
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Added CGI environment support.
-     */
-    public function getHeader($header)
-    {
-        $headerValue = parent::getHeader($header);
-        if ($headerValue == false) {
-            /** Workaround for php-fpm environment */
-            $header = strtoupper(str_replace('-', '_', $header));
-            if (isset($_SERVER[$header]) && in_array($header, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
-                $headerValue = $_SERVER[$header];
-            }
-        }
-        return $headerValue;
-    }
 }
diff --git a/composer.json b/composer.json
index d7527aa56bfb5..666a59684e656 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "zendframework/zend-serializer": "2.3.1",
         "zendframework/zend-log": "2.3.1",
         "zendframework/zend-http": "2.3.1",
-        "magento/zendframework1": "1.12.9-patch1",
+        "magento/zendframework1": "1.12.10",
         "composer/composer": "1.0.0-alpha8",
         "monolog/monolog": "1.11.0",
         "tubalmartin/cssmin": "2.4.8-p4"
diff --git a/composer.lock b/composer.lock
index 2559c3367491d..94ae6e108db84 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d846c53787f01625cc9fe558afdd5371",
+    "hash": "26060fb59709cfc0315a94c289649ca7",
     "packages": [
         {
             "name": "composer/composer",
@@ -133,16 +133,16 @@
         },
         {
             "name": "magento/zendframework1",
-            "version": "1.12.9-patch1",
+            "version": "1.12.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/zf1.git",
-                "reference": "956e87daf5bfde66357b70365d42a484c6b7728b"
+                "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/zf1/zipball/956e87daf5bfde66357b70365d42a484c6b7728b",
-                "reference": "956e87daf5bfde66357b70365d42a484c6b7728b",
+                "url": "https://api.github.com/repos/magento/zf1/zipball/d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
+                "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
                 "shasum": ""
             },
             "require": {
@@ -176,7 +176,7 @@
                 "ZF1",
                 "framework"
             ],
-            "time": "2014-12-12 15:28:16"
+            "time": "2015-02-06 17:25:45"
         },
         {
             "name": "monolog/monolog",
@@ -3263,6 +3263,7 @@
         "phpmd/phpmd": 0
     },
     "prefer-stable": false,
+    "prefer-lowest": false,
     "platform": {
         "php": "~5.5.0|~5.6.0"
     },