Merge pull request #385 from eclipse/bugs/124
Issue #124 - Don't produce text/html if the request doesn't accept it merge to master may need manual help
This commit is contained in:
commit
9291953380
|
@ -29,6 +29,7 @@ import javax.servlet.ServletException;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import org.eclipse.jetty.http.HttpField;
|
||||||
import org.eclipse.jetty.http.HttpFields;
|
import org.eclipse.jetty.http.HttpFields;
|
||||||
import org.eclipse.jetty.http.HttpHeader;
|
import org.eclipse.jetty.http.HttpHeader;
|
||||||
import org.eclipse.jetty.http.HttpMethod;
|
import org.eclipse.jetty.http.HttpMethod;
|
||||||
|
@ -110,16 +111,22 @@ public class ErrorHandler extends AbstractHandler
|
||||||
}
|
}
|
||||||
|
|
||||||
baseRequest.setHandled(true);
|
baseRequest.setHandled(true);
|
||||||
response.setContentType(MimeTypes.Type.TEXT_HTML_8859_1.asString());
|
|
||||||
if (_cacheControl!=null)
|
// Issue #124 - Don't produce text/html if the request doesn't accept it
|
||||||
response.setHeader(HttpHeader.CACHE_CONTROL.asString(), _cacheControl);
|
HttpField accept = baseRequest.getHttpFields().getField(HttpHeader.ACCEPT);
|
||||||
ByteArrayISO8859Writer writer= new ByteArrayISO8859Writer(4096);
|
if (accept == null || accept.contains("text/html") || accept.contains("*/*"))
|
||||||
String reason=(response instanceof Response)?((Response)response).getReason():null;
|
{
|
||||||
handleErrorPage(request, writer, response.getStatus(), reason);
|
response.setContentType(MimeTypes.Type.TEXT_HTML_8859_1.asString());
|
||||||
writer.flush();
|
if (_cacheControl != null)
|
||||||
response.setContentLength(writer.size());
|
response.setHeader(HttpHeader.CACHE_CONTROL.asString(), _cacheControl);
|
||||||
writer.writeTo(response.getOutputStream());
|
ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(4096);
|
||||||
writer.destroy();
|
String reason = (response instanceof Response) ? ((Response) response).getReason() : null;
|
||||||
|
handleErrorPage(request, writer, response.getStatus(), reason);
|
||||||
|
writer.flush();
|
||||||
|
response.setContentLength(writer.size());
|
||||||
|
writer.writeTo(response.getOutputStream());
|
||||||
|
writer.destroy();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------ */
|
/* ------------------------------------------------------------ */
|
||||||
|
|
Loading…
Reference in New Issue