diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 2 | ||||
| -rwxr-xr-x | lib/request.php | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 0e751c0f0ec..f70496912df 100644 --- a/lib/base.php +++ b/lib/base.php @@ -597,7 +597,7 @@ class OC { if (!self::$CLI) { try { OC_App::loadApps(); - OC::getRouter()->match(OC_Request::getPathInfo()); + OC::getRouter()->match(OC_Request::getRawPathInfo()); return; } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) { //header('HTTP/1.0 404 Not Found'); diff --git a/lib/request.php b/lib/request.php index 30a25df23ab..9f74cf9beb5 100755 --- a/lib/request.php +++ b/lib/request.php @@ -107,7 +107,7 @@ class OC_Request { if (array_key_exists('PATH_INFO', $_SERVER)) { $path_info = $_SERVER['PATH_INFO']; }else{ - $path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME'])); + $path_info = self::getRawPathInfo(); // following is taken from Sabre_DAV_URLUtil::decodePathSegment $path_info = rawurldecode($path_info); $encoding = mb_detect_encoding($path_info, array('UTF-8', 'ISO-8859-1')); @@ -124,6 +124,19 @@ class OC_Request { } /** + * @brief get Path info from request, not urldecoded + * @returns string Path info or false when not found + */ + public static function getRawPathInfo() { + $path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME'])); + // Remove the query string from REQUEST_URI + if ($pos = strpos($path_info, '?')) { + $path_info = substr($path_info, 0, $pos); + } + return $path_info; + } + + /** * @brief Check if this is a no-cache request * @returns true for no-cache */ |