Updating ee11 from ee10
This commit is contained in:
parent
9261ed948c
commit
73c358affb
|
@ -763,10 +763,9 @@ public abstract class AbstractProxyServlet extends HttpServlet
|
|||
}
|
||||
}
|
||||
|
||||
protected void onContinue(HttpServletRequest clientRequest, Request proxyRequest)
|
||||
protected Runnable onContinue(HttpServletRequest clientRequest, Request proxyRequest)
|
||||
{
|
||||
if (_log.isDebugEnabled())
|
||||
_log.debug("{} handling 100 Continue", getRequestId(clientRequest));
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -851,10 +850,10 @@ public abstract class AbstractProxyServlet extends HttpServlet
|
|||
class ProxyContinueProtocolHandler extends ContinueProtocolHandler
|
||||
{
|
||||
@Override
|
||||
protected void onContinue(Request request)
|
||||
protected Runnable onContinue(Request request)
|
||||
{
|
||||
HttpServletRequest clientRequest = (HttpServletRequest)request.getAttributes().get(CLIENT_REQUEST_ATTRIBUTE);
|
||||
AbstractProxyServlet.this.onContinue(clientRequest, request);
|
||||
return AbstractProxyServlet.this.onContinue(clientRequest, request);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -171,11 +171,11 @@ public class AsyncMiddleManServlet extends AbstractProxyServlet
|
|||
}
|
||||
|
||||
@Override
|
||||
protected void onContinue(HttpServletRequest clientRequest, Request proxyRequest)
|
||||
protected Runnable onContinue(HttpServletRequest clientRequest, Request proxyRequest)
|
||||
{
|
||||
super.onContinue(clientRequest, proxyRequest);
|
||||
Runnable action = (Runnable)proxyRequest.getAttributes().get(CONTINUE_ACTION_ATTRIBUTE);
|
||||
action.run();
|
||||
if (_log.isDebugEnabled())
|
||||
_log.debug("{} handling 100 Continue", getRequestId(clientRequest));
|
||||
return (Runnable)proxyRequest.getAttributes().get(CONTINUE_ACTION_ATTRIBUTE);
|
||||
}
|
||||
|
||||
private void transform(ContentTransformer transformer, ByteBuffer input, boolean finished, List<ByteBuffer> output) throws IOException
|
||||
|
|
|
@ -16,7 +16,6 @@ package org.eclipse.jetty.ee11.proxy;
|
|||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import jakarta.servlet.AsyncContext;
|
||||
|
@ -144,12 +143,11 @@ public class ProxyServlet extends AbstractProxyServlet
|
|||
}
|
||||
|
||||
@Override
|
||||
protected void onContinue(HttpServletRequest clientRequest, Request proxyRequest)
|
||||
protected Runnable onContinue(HttpServletRequest clientRequest, Request proxyRequest)
|
||||
{
|
||||
super.onContinue(clientRequest, proxyRequest);
|
||||
Runnable action = (Runnable)proxyRequest.getAttributes().get(CONTINUE_ACTION_ATTRIBUTE);
|
||||
Executor executor = getHttpClient().getExecutor();
|
||||
executor.execute(action);
|
||||
if (_log.isDebugEnabled())
|
||||
_log.debug("{} handling 100 Continue", getRequestId(clientRequest));
|
||||
return (Runnable)proxyRequest.getAttributes().get(CONTINUE_ACTION_ATTRIBUTE);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue