Merge pull request #23383 from owncloud/backport-use-raw-path

[stable9] Use raw PATH_INFO
This commit is contained in:
Thomas Müller 2016-03-21 18:03:10 +01:00
commit 3d19a179c7
2 changed files with 3 additions and 3 deletions

View File

@ -62,8 +62,8 @@
# Rewrite rules for `front_controller_active`
Options -MultiViews
RewriteRule ^core/js/oc.js$ index.php/core/js/oc.js [PT,E=PATH_INFO:$1]
RewriteRule ^core/preview.png$ index.php/core/preview.png [PT,E=PATH_INFO:$1]
RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1]
RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1]
RewriteCond %{REQUEST_FILENAME} !\.(css|js|svg|gif|png|html|ttf|woff|ico)$
RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$
RewriteCond %{REQUEST_FILENAME} !/remote.php

View File

@ -830,7 +830,7 @@ class OC {
}
$request = \OC::$server->getRequest();
$requestPath = $request->getPathInfo();
$requestPath = $request->getRawPathInfo();
if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
self::checkMaintenanceMode();
self::checkUpgrade();