Skip to content
Snippets Groups Projects
Unverified Commit c5742124 authored by Joas Schilling's avatar Joas Schilling
Browse files

Fix mimetype detection for junked uploads

parent c0f48a7b
No related branches found
No related tags found
No related merge requests found
......@@ -83,9 +83,13 @@ class FileMimeType extends AbstractStringCheck {
return $this->mimeType[$this->storage->getId()][$this->path];
}
if ($this->request->getMethod() === 'PUT') {
$path = $this->request->getPathInfo();
$this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path);
if ($this->request->getMethod() === 'PUT' || $this->request->getMethod() === 'MOVE') {
if ($this->request->getMethod() === 'MOVE') {
$this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($this->path);
} else {
$path = $this->request->getPathInfo();
$this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path);
}
return $this->mimeType[$this->storage->getId()][$this->path];
}
} else if ($this->isPublicWebDAVRequest()) {
......@@ -171,7 +175,9 @@ class FileMimeType extends AbstractStringCheck {
$this->request->getPathInfo() === '/webdav' ||
strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
$this->request->getPathInfo() === '/dav/files' ||
strpos($this->request->getPathInfo(), '/dav/files/') === 0
strpos($this->request->getPathInfo(), '/dav/files/') === 0 ||
$this->request->getPathInfo() === '/dav/uploads' ||
strpos($this->request->getPathInfo(), '/dav/uploads/') === 0
);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment