Merge remote-tracking branch 'falcons/MAGETWO-60792' into MAGETWO-60647

lib/internal/Magento/Framework/App/Http.php

@@ -241,8 +241,7 @@ class Http implements \Magento\Framework\AppInterface
                 . "because the Magento setup directory cannot be accessed. \n"
                 . 'You can install Magento using either the command line or you must restore access '
                 . 'to the following directory: ' . $setupInfo->getDir($projectRoot) . "\n";
-            $newMessage .= 'If you are using the sample nginx configuration, please go to '
-                . $this->_request->getScheme(). '://' . $this->_request->getHttpHost() . $setupInfo->getUrl();
+
             throw new \Exception($newMessage, 0, $exception);
         }
     }

lib/internal/Magento/Framework/App/SetupInfo.php

@@ -147,6 +147,14 @@ class SetupInfo
     {
         $setupDir = $this->getDir($this->projectRoot);
         $isSubDir = false !== strpos($setupDir . '/', $this->docRoot . '/');
+        // Setup is not accessible from pub folder
+        $setupDir = rtrim($setupDir, '/');
+        $lastOccurrence = strrpos($setupDir, '/pub/setup');
+
+        if (false !== $lastOccurrence) {
+            $setupDir = substr_replace($setupDir, '/setup', $lastOccurrence, strlen('/pub/setup'));
+        }
+
         return $isSubDir && realpath($setupDir);
     }
 

lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php

@@ -193,6 +193,13 @@ class SetupInfoTest extends \PHPUnit_Framework_TestCase
                 ],
                 true
             ],
+            'root within doc root + pub, existent sub-directory' => [
+                [
+                    'DOCUMENT_ROOT' => __DIR__ . '/_files/pub/',
+                    'SCRIPT_FILENAME' => __DIR__ . '/_files/pub/index.php',
+                ],
+                true
+            ],
         ];
     }
 }

lib/internal/Magento/Framework/App/Test/Unit/_files/pub/index.php

+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */

lib/internal/Magento/Framework/App/Test/Unit/_files/setup/index.php

+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */

pub/media/.htaccess

@@ -11,6 +11,10 @@ php_flag engine 0
 AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
 Options -ExecCGI
 
+<FilesMatch ".+\.(ph(p[3457]?|t|tml)|[aj]sp|p[ly]|sh|cgi|shtml?|html?)$">
+SetHandler default-handler
+</FilesMatch>
+
 <IfModule mod_rewrite.c>
 
 ############################################