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

Avoid to specify a content in the proxied request if there is none in 

the original request.
This commit is contained in:
Simone Bordet 2013-10-21 22:42:49 +02:00
parent eaefd17652
commit 25f2fcc691
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,6 +389,7 @@ public class ProxyServlet extends HttpServlet
.version(HttpVersion.fromString(request.getProtocol()));
// Copy headers
boolean hasContent = false;
for (Enumeration<String> headerNames = request.getHeaderNames(); headerNames.hasMoreElements();)
{
String headerName = headerNames.nextElement();
@ -398,9 +399,13 @@ public class ProxyServlet extends HttpServlet
if (HOP_HEADERS.contains(lowerHeaderName))
continue;
if (_hostHeader!=null && lowerHeaderName.equals("host"))
if (_hostHeader != null && HttpHeader.HOST.is(headerName))
continue;
if (request.getContentLength() > 0 || request.getContentType() != null ||
HttpHeader.TRANSFER_ENCODING.is(headerName))
hasContent = true;
for (Enumeration<String> headerValues = request.getHeaders(headerName); headerValues.hasMoreElements();)
{
String headerValue = headerValues.nextElement();
@ -420,21 +425,24 @@ public class ProxyServlet extends HttpServlet
proxyRequest.header(HttpHeader.X_FORWARDED_HOST, request.getHeader(HttpHeader.HOST.asString()));
proxyRequest.header(HttpHeader.X_FORWARDED_SERVER, request.getLocalName());
proxyRequest.content(new InputStreamContentProvider(request.getInputStream())
if (hasContent)
{
@Override
public long getLength()
proxyRequest.content(new InputStreamContentProvider(request.getInputStream())
{
return request.getContentLength();
}
@Override
public long getLength()
{
return request.getContentLength();
}
@Override
protected ByteBuffer onRead(byte[] buffer, int offset, int length)
{
_log.debug("{} proxying content to upstream: {} bytes", requestId, length);
return super.onRead(buffer, offset, length);
}
});
@Override
protected ByteBuffer onRead(byte[] buffer, int offset, int length)
{
_log.debug("{} proxying content to upstream: {} bytes", requestId, length);
return super.onRead(buffer, offset, length);
}
});
}
final AsyncContext asyncContext = request.startAsync();
// We do not timeout the continuation, but the proxy request