JETTY-1084

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@827 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Jan Bartel 2009-09-08 08:34:15 +00:00
parent f47ddbee95
commit cbcbb96be1
3 changed files with 3 additions and 2 deletions

View File

@ -3,6 +3,7 @@ jetty-7.0.0.RC6-SNAPSHOT
+ 288153 jetty-client resend doesn't reset exchange + 288153 jetty-client resend doesn't reset exchange
+ 288182 PUT request fails during retry + 288182 PUT request fails during retry
+ JETTY-1080 modify previous fix to work on windows + JETTY-1080 modify previous fix to work on windows
+ JETTY-1084 HEAD command not setting content-type in response under certain circumstances
+ JETTY-1086 Use UncheckedPrintWriter + JETTY-1086 Use UncheckedPrintWriter
+ JETTY-1090 resolve potential infinite loop with webdav listener + JETTY-1090 resolve potential infinite loop with webdav listener
+ JETTY-1092 MultiPartFilter can be pushed into infinite loop + JETTY-1092 MultiPartFilter can be pushed into infinite loop

View File

@ -50,7 +50,7 @@ public class ErrorHandler extends AbstractHandler
HttpConnection connection = HttpConnection.getCurrentConnection(); HttpConnection connection = HttpConnection.getCurrentConnection();
connection.getRequest().setHandled(true); connection.getRequest().setHandled(true);
String method = request.getMethod(); String method = request.getMethod();
if(!method.equals(HttpMethods.GET) && !method.equals(HttpMethods.POST)) if(!method.equals(HttpMethods.GET) && !method.equals(HttpMethods.POST) && !method.equals(HttpMethods.HEAD))
return; return;
response.setContentType(MimeTypes.TEXT_HTML_8859_1); response.setContentType(MimeTypes.TEXT_HTML_8859_1);
response.setHeader(HttpHeaders.CACHE_CONTROL, "must-revalidate,no-cache,no-store"); response.setHeader(HttpHeaders.CACHE_CONTROL, "must-revalidate,no-cache,no-store");

View File

@ -62,7 +62,7 @@ public class ErrorPageErrorHandler extends ErrorHandler
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException
{ {
String method = request.getMethod(); String method = request.getMethod();
if(!method.equals(HttpMethods.GET) && !method.equals(HttpMethods.POST)) if(!method.equals(HttpMethods.GET) && !method.equals(HttpMethods.POST) && !method.equals(HttpMethods.HEAD))
{ {
HttpConnection.getCurrentConnection().getRequest().setHandled(true); HttpConnection.getCurrentConnection().getRequest().setHandled(true);
return; return;