Skip to content

Commit 7d2acfc

Browse files
committed
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
1 parent 209cfbe commit 7d2acfc

File tree

3 files changed

+8
-25
lines changed

3 files changed

+8
-25
lines changed

app/code/Magento/Webapi/Controller/Request.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,4 @@ public function getCookie($name = null, $default = null)
5252
{
5353
return $this->_cookieReader->getCookie($name, $default);
5454
}
55-
56-
/**
57-
* {@inheritdoc}
58-
*
59-
* Added CGI environment support.
60-
*/
61-
public function getHeader($header)
62-
{
63-
$headerValue = parent::getHeader($header);
64-
if ($headerValue == false) {
65-
/** Workaround for php-fpm environment */
66-
$header = strtoupper(str_replace('-', '_', $header));
67-
if (isset($_SERVER[$header]) && in_array($header, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
68-
$headerValue = $_SERVER[$header];
69-
}
70-
}
71-
return $headerValue;
72-
}
7355
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"zendframework/zend-serializer": "2.3.1",
3030
"zendframework/zend-log": "2.3.1",
3131
"zendframework/zend-http": "2.3.1",
32-
"magento/zendframework1": "1.12.9-patch1",
32+
"magento/zendframework1": "1.12.10",
3333
"composer/composer": "1.0.0-alpha8",
3434
"monolog/monolog": "1.11.0",
3535
"tubalmartin/cssmin": "2.4.8-p4"

composer.lock

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)