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

JETTY-1081 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@747 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Athena Yao 2009-08-20 12:29:20 +00:00
parent 7e6b89f986
commit 7e760b5a7c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -1,5 +1,6 @@
jetty-7.0.0-SNAPSHOT jetty-7.0.0-SNAPSHOT
+ 286911 Clean out cache when recycling HTTP fields + 286911 Clean out cache when recycling HTTP fields
+ JETTY-1081 Handle null content type in GzipFilter
jetty-7.0.0.RC4 18 August 2009 jetty-7.0.0.RC4 18 August 2009
+ 286185 Implement ability for JSON implementation to automatically register convertors + 286185 Implement ability for JSON implementation to automatically register convertors

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

@ -44,7 +44,7 @@ import org.eclipse.jetty.util.log.Log;
* <li>The filter is mapped to a matching path</li> * <li>The filter is mapped to a matching path</li>
* <li>The response status code is >=200 and <300 * <li>The response status code is >=200 and <300
* <li>The content length is unknown or more than the <code>minGzipSize</code> initParameter or the minGzipSize is 0(default)</li> * <li>The content length is unknown or more than the <code>minGzipSize</code> initParameter or the minGzipSize is 0(default)</li>
* <li>The content-type is in the coma separated list of mimeTypes set in the <code>mimeTypes</code> initParameter or * <li>The content-type is in the comma separated list of mimeTypes set in the <code>mimeTypes</code> initParameter or
* if no mimeTypes are defined the content-type is not "application/gzip"</li> * if no mimeTypes are defined the content-type is not "application/gzip"</li>
* <li>No content-encoding is specified by the resource</li> * <li>No content-encoding is specified by the resource</li>
* </ul> * </ul>
@ -190,13 +190,17 @@ public class GzipFilter extends UserAgentFilter
public void setContentType(String ct) public void setContentType(String ct)
{ {
super.setContentType(ct); super.setContentType(ct);
int colon=ct.indexOf(";");
if (colon>0) if (ct!=null)
ct=ct.substring(0,colon); {
int colon=ct.indexOf(";");
if (colon>0)
ct=ct.substring(0,colon);
}
if ((_gzStream==null || _gzStream._out==null) && if ((_gzStream==null || _gzStream._out==null) &&
(_mimeTypes==null && "application/gzip".equalsIgnoreCase(ct) || (_mimeTypes==null && "application/gzip".equalsIgnoreCase(ct) ||
_mimeTypes!=null && !_mimeTypes.contains(StringUtil.asciiToLowerCase(ct)))) _mimeTypes!=null && (ct==null||!_mimeTypes.contains(StringUtil.asciiToLowerCase(ct)))))
{ {
noGzip(); noGzip();
} }