Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge jetty-8 to master

This commit is contained in:
Jesse McConnell 2013-01-29 14:06:47 -06:00
parent 335611815c 3b6cab63e2
commit e26c60e073
3 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-distribution/pom.xml
View File

@ -453,7 +453,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jndi</artifactId>
<artifactId>jetty-continuation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

47
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
View File

@ -552,51 +552,4 @@ public class GzipFilter extends UserAgentFilter
}
return false;
}
private class VaryResponseWrapper extends HttpServletResponseWrapper
{
public VaryResponseWrapper(HttpServletResponse response)
{
super(response);
}
@Override
public void addHeader(String name, String value)
{
if ("content-type".equalsIgnoreCase(name))
{
setContentType(value);
}
else
super.addHeader(name,value);
}
@Override
public void setHeader(String name, String value)
{
if ("content-type".equalsIgnoreCase(name))
{
setContentType(value);
}
else
super.setHeader(name,value);
}
@Override
public void setContentType(String ct)
{
super.setContentType(ct);
if (ct!=null)
{
int colon=ct.indexOf(";");
if (colon>0)
ct=ct.substring(0,colon);
}
if (_mimeTypes!=null && _mimeTypes.contains(StringUtil.asciiToLowerCase(ct)))
super.setHeader("Vary",_vary);
}
}
}

5
tests/test-webapps/test-jetty-webapp/pom.xml
View File

@ -191,6 +191,11 @@
<artifactId>jetty-servlets</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>