Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable13] Fix mimetype detection for junked uploads #10829

Merged

Conversation

nickvergessen
Copy link
Member

Backport #10828

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen requested a review from blizzz September 5, 2018 13:10
@nickvergessen
Copy link
Member Author

Second review please for this backport @blizzz @schiessle

$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') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could have been an elsif, less nesting, but OK

Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@blizzz blizzz merged commit 9c68ce1 into stable13 Sep 13, 2018
@blizzz blizzz deleted the backport/10828/mimetype-detection-broken-for-junked-uploads branch September 13, 2018 08:51
This was referenced Oct 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants