holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vfs stores %, # and ? urlencoded, we do the encoding here on a central place

Browse Source
This commit is contained in:
Ralf Becker 2019-03-21 12:43:25 +01:00
parent 4b5379d61b
commit d5d098b184
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/WebDAV/Server.php
View File

@ -237,9 +237,7 @@ class HTTP_WebDAV_Server
$this->uri = $uri . $path_info; $this->uri = $uri . $path_info;
// set path // set path
// $_SERVER['PATH_INFO'] is already urldecoded // Vfs stores %, # and ? urlencoded, we do the encoding here on a central place
//$this->path = self::_urldecode($path_info);
// quote '#' (e.g. OpenOffice uses this for lock-files)
$this->path = strtr($path_info,array( $this->path = strtr($path_info,array(
'%' => '%25', '%' => '%25',
'#' => '%23', '#' => '%23',
@ -2185,7 +2183,13 @@ class HTTP_WebDAV_Server
$http_header_host = preg_replace("/:80$/", "", $this->_SERVER["HTTP_HOST"]); $http_header_host = preg_replace("/:80$/", "", $this->_SERVER["HTTP_HOST"]);
$url = parse_url($this->_SERVER["HTTP_DESTINATION"]); $url = parse_url($this->_SERVER["HTTP_DESTINATION"]);
$path = urldecode($url["path"]); // Vfs stores %, # and ? urlencoded, we do the encoding here on a central place
$path = strtr(self::_urldecode($url["path"]), array(
'%' => '%25',
'#' => '%23',
'?' => '%3F',
));
//error_log(__METHOD__."(".array2string($what).") parse_url(HTTP_DESTINATION=".array2string($this->_SERVER["HTTP_DESTINATION"]).")=".array2string($url)." --> ".array2string($path));
if (isset($url["host"])) { if (isset($url["host"])) {
// TODO check url scheme, too // TODO check url scheme, too