diff options
| author | Jacek Poreda <jacek.poreda@sonarsource.com> | 2023-04-24 11:47:40 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2023-04-25 20:03:48 +0000 |
| commit | 350ecd17dd18d82cee9a0c5f9316fba83aa69dce (patch) | |
| tree | fe2cbb071174c4267ab605213b1f383389c47de0 | |
| parent | 26d7da935bdf92aeb4d4ca0252d5d432bf6455c4 (diff) | |
| download | sonarqube-350ecd17dd18d82cee9a0c5f9316fba83aa69dce.tar.gz sonarqube-350ecd17dd18d82cee9a0c5f9316fba83aa69dce.zip | |
SONAR-19091 Fix SSF-383
(cherry picked from commit 9708d98955560e51ecc3d1089a7d68e81277114c)
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatConnectors.java | 2 | ||||
| -rw-r--r-- | sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 3f6e5536ece..f3e70cccb31 100644 --- a/build.gradle +++ b/build.gradle @@ -295,7 +295,7 @@ subprojects { entry 'log4j-api' entry 'log4j-to-slf4j' } - dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.70') { + dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.74') { entry 'tomcat-embed-core' entry('tomcat-embed-jasper') { exclude 'org.eclipse.jdt.core.compiler:ecj' diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatConnectors.java b/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatConnectors.java index b9d31776b8c..7f5487903d3 100644 --- a/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatConnectors.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatConnectors.java @@ -89,7 +89,7 @@ class TomcatConnectors { private static void configureCompression(Connector connector) { connector.setProperty("compression", "on"); connector.setProperty("compressionMinSize", "1024"); - connector.setProperty("compressableMimeType", "text/html,text/xml,text/plain,text/css,application/json,application/javascript"); + connector.setProperty("compressibleMimeType", "text/html,text/xml,text/plain,text/css,application/json,application/javascript,text/javascript"); } private static void setConnectorAttribute(Connector c, String key, @Nullable Object value) { diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java b/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java index 5da0f634a6a..88062ad50d1 100644 --- a/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java +++ b/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java @@ -32,7 +32,7 @@ public final class MediaTypes { public static final String CSV = "text/csv"; public static final String DEFAULT = "application/octet-stream"; public static final String HTML = "text/html"; - public static final String JAVASCRIPT = "application/javascript"; + public static final String JAVASCRIPT = "text/javascript"; public static final String JSON = "application/json"; public static final String PROTOBUF = "application/x-protobuf"; public static final String SVG = "image/svg+xml"; |