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

Fix Content-Type detection for web interface assets #1983

Merged
merged 3 commits into from Mar 29, 2016
Merged

Fix Content-Type detection for web interface assets #1983

merged 3 commits into from Mar 29, 2016

Conversation

@joschi
Copy link
Contributor

@joschi joschi commented Mar 29, 2016

This PR fixes the Content-Type detection for web interface assets by pulling in a MIME type database (taken from Debian Linux) instead of relying on (wonky) system defaults.

Additionally it fixes the caching behavior of WebInterfaceAssetsResource.

Fixes #1982

Jochen Schalanda added 2 commits Mar 29, 2016
MIME types are defined in META-INF/mime.types, imported from Debian Linux.
Source URL: https://anonscm.debian.org/cgit/collab-maint/mime-support.git/plain/mime.types

Fixes #1982
Unless the class is being marked as singleton, it's being instantiated for every
request, making the filesystem cache useless.
@joschi joschi added this to the 2.0.0 milestone Mar 29, 2016
@bernd bernd self-assigned this Mar 29, 2016
@bernd
Copy link
Member

@bernd bernd commented Mar 29, 2016

LGTM 👍

@bernd bernd merged commit 207ab0d into master Mar 29, 2016
4 checks passed
4 checks passed
ci-server-integration Jenkins build graylog2-server-integration-pr 764 has succeeded
Details
ci-web-linter Jenkins build graylog-pr-linter-check 253 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@bernd bernd deleted the issue-1982 branch Mar 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants
You can’t perform that action at this time.