diff options
| -rw-r--r-- | container-dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 1f94372fc14..b4af6800768 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -464,7 +464,7 @@ <guava.version>18.0</guava.version> <guice.version>3.0</guice.version> <jaxb.version>2.2.7</jaxb.version> - <jetty.version>9.4.9.v20180320</jetty.version> + <jetty.version>9.4.10.v20180503</jetty.version> <scala.version>2.11.12</scala.version> <!-- When updating this, the scala.major-version in parent must also be updated! --> <slf4j.version>1.7.5</slf4j.version> diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java index d491daf55dd..c85917c4c7e 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java @@ -360,10 +360,11 @@ public class JettyHttpServer extends AbstractServerProvider { return statisticsHandler; } + @SuppressWarnings("deprecation") private GzipHandler newGzipHandler(ServerConfig serverConfig) { GzipHandler gzipHandler = new GzipHandlerWithVaryHeaderFixed(); gzipHandler.setCompressionLevel(serverConfig.responseCompressionLevel()); - gzipHandler.setCheckGzExists(false); + gzipHandler.setCheckGzExists(false); // TODO: will be removed without replacement in Jetty 10 gzipHandler.setIncludedMethods("GET", "POST"); return gzipHandler; } |