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

445518 - Provide different error callbacks to ProxyServlet. 

Method names have been rationalized, and the old names deprecated.
Now methods have "clientRequest", "proxyRequest", "serverResponse" and
"proxyResponse" in their names to indicate the operation they belong to.
This commit is contained in:
Simone Bordet 2015-03-06 13:10:11 +01:00
parent a13a55e242
commit d63ed9864d
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AbstractProxyServlet.java
View File

@ -390,7 +390,7 @@ public abstract class AbstractProxyServlet extends HttpServlet
clientRequest.getHeader(HttpHeader.TRANSFER_ENCODING.asString()) != null;
}
protected void copyHeaders(HttpServletRequest clientRequest, Request proxyRequest)
protected void copyRequestHeaders(HttpServletRequest clientRequest, Request proxyRequest)
{
// First clear possibly existing headers, as we are going to copy those from the client request.
proxyRequest.getHeaders().clear();

3
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncMiddleManServlet.java
View File

@ -28,7 +28,6 @@ import java.util.List;
import java.util.Queue;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;
import javax.servlet.AsyncContext;
import javax.servlet.ReadListener;
import javax.servlet.ServletException;
@ -82,7 +81,7 @@ public class AsyncMiddleManServlet extends AbstractProxyServlet
boolean hasContent = hasContent(clientRequest);
copyHeaders(clientRequest, proxyRequest);
copyRequestHeaders(clientRequest, proxyRequest);
addProxyHeaders(clientRequest, proxyRequest);

9
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
View File

@ -108,6 +108,15 @@ public class ProxyServlet extends AbstractProxyServlet
sendProxyRequest(request, response, proxyRequest);
}
/**
* @deprecated use {@link #copyRequestHeaders(HttpServletRequest, Request)} instead
*/
@Deprecated
protected void copyHeaders(HttpServletRequest clientRequest, Request proxyRequest)
{
copyRequestHeaders(clientRequest, proxyRequest);
}
protected ContentProvider proxyRequestContent(final Request proxyRequest, final HttpServletRequest request) throws IOException
{
return new ProxyInputStreamContentProvider(proxyRequest, request, request.getInputStream());