Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2016-02-24 16:49:27 +00:00
parent 7d84273d98 1c715ab282
commit 6bb9eb421f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2015 the original author or authors.
* Copyright 2012-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -664,8 +664,7 @@ public class JettyEmbeddedServletContainerFactory
public HandlerWrapper createGzipHandler(Compression compression) {
GzipHandler gzipHandler = new GzipHandler();
gzipHandler.setMinGzipSize(compression.getMinResponseSize());
gzipHandler.setMimeTypes(
new HashSet<String>(Arrays.asList(compression.getMimeTypes())));
gzipHandler.addIncludedMimeTypes(compression.getMimeTypes());
if (compression.getExcludedUserAgents() != null) {
gzipHandler.setExcluded(new HashSet<String>(
Arrays.asList(compression.getExcludedUserAgents())));