diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-05-15 09:49:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-15 09:49:11 -0500 |
| commit | 8c5062794f3abc157e48af2cf4bc3c0dfe570cbe (patch) | |
| tree | 7f7725c48d472766b0d6a2933b1939d5c5ce4258 /lib/base.php | |
| parent | 3bd51321de17b7a4dea361955c4affc1aff92739 (diff) | |
| parent | 72c1b248442fb05ef2ef1e8fbf3399cb06188013 (diff) | |
| download | nextcloud-server-8c5062794f3abc157e48af2cf4bc3c0dfe570cbe.tar.gz nextcloud-server-8c5062794f3abc157e48af2cf4bc3c0dfe570cbe.zip | |
Merge pull request #4873 from nextcloud/check-whether-REQUEST-exists
Check whether the $_SERVER['REQUEST_*'] vars exist before using them
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 0a51d3af5fc..38e9fb8e498 100644 --- a/lib/base.php +++ b/lib/base.php @@ -132,7 +132,7 @@ class OC { OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT))); /** - * FIXME: The following lines are required because we can't yet instantiiate + * FIXME: The following lines are required because we can't yet instantiate * \OC::$server->getRequest() since \OC::$server does not yet exist. */ $params = [ @@ -174,7 +174,7 @@ class OC { // Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing // slash which is required by URL generation. - if($_SERVER['REQUEST_URI'] === \OC::$WEBROOT && + if (isset($_SERVER['REQUEST_URI']) && $_SERVER['REQUEST_URI'] === \OC::$WEBROOT && substr($_SERVER['REQUEST_URI'], -1) !== '/') { header('Location: '.\OC::$WEBROOT.'/'); exit(); @@ -1008,7 +1008,7 @@ class OC { } // Handle WebDAV - if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') { + if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') { // not allowed any more to prevent people // mounting this root directly. // Users need to mount remote.php/webdav instead. |