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

Merged branch 'jetty-9.4.x' into 'master'.

This commit is contained in:
Simone Bordet 2017-10-09 16:00:04 +02:00
parent c26373783b a436b9eb6c
commit 14f7b03060
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-client/src/main/java/org/eclipse/jetty/client/ContinueProtocolHandler.java
View File

@ -24,6 +24,8 @@ import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Response;
import org.eclipse.jetty.client.api.Result; import org.eclipse.jetty.client.api.Result;
import org.eclipse.jetty.client.util.BufferingResponseListener; import org.eclipse.jetty.client.util.BufferingResponseListener;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpHeaderValue;
import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpStatus;
/** /**
@ -50,12 +52,11 @@ public class ContinueProtocolHandler implements ProtocolHandler
@Override @Override
public boolean accept(Request request, Response response) public boolean accept(Request request, Response response)
{ {
if (response.getStatus() == HttpStatus.CONTINUE_100) boolean is100 = response.getStatus() == HttpStatus.CONTINUE_100;
{ boolean expect100 = request.getHeaders().contains(HttpHeader.EXPECT, HttpHeaderValue.CONTINUE.asString());
HttpConversation conversation = ((HttpRequest)request).getConversation(); HttpConversation conversation = ((HttpRequest)request).getConversation();
return conversation.getAttribute(ATTRIBUTE) == null; boolean handled100 = conversation.getAttribute(ATTRIBUTE) != null;
} return (is100 || expect100) && !handled100;
return false;
} }
@Override @Override