Merge branch 'develop' of https://github.com/Adyen/adyen-magento2 into develop

f50664e2 · Rik ter Beek · a4cac2fc · cc34fadb · f50664e2
Commit f50664e2 authored Mar 29, 2017 by Rik ter Beek
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

Controller/Process/Json.php Controller/Process/Json.php +3 -0

No files found.
--- a/Controller/Process/Json.php
+++ b/Controller/Process/Json.php
@@ -301,6 +301,9 @@ class Json extends \Magento\Framework\App\Action\Action
            $_SERVER['REDIRECT_REMOTE_AUTHORIZATION'] != '') {
            list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
                explode(':', base64_decode($_SERVER['REDIRECT_REMOTE_AUTHORIZATION']));
+        } elseif (!empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
+            list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
+                explode(':', base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
        } elseif (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
            list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
                explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));