You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2007/06/12 21:24:17 UTC
svn commit: r546608 -
/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
Author: olegk
Date: Tue Jun 12 12:24:16 2007
New Revision: 546608
URL: http://svn.apache.org/viewvc?view=rev&rev=546608
Log:
Fixed bug in the 'expect: continue' handshake code
Modified:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java?view=diff&rev=546608&r1=546607&r2=546608
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java Tue Jun 12 12:24:16 2007
@@ -312,7 +312,9 @@
connState.setInputState(ClientConnState.RESPONSE_RECEIVED);
if (connState.getOutputState() == ClientConnState.EXPECT_CONTINUE) {
- cancelRequest(conn, connState);
+ int timeout = connState.getTimeout();
+ conn.setSocketTimeout(timeout);
+ conn.resetOutput();
}
}
if (!canResponseHaveBody(request, response)) {
@@ -429,17 +431,6 @@
(HttpEntityEnclosingRequest) request,
connState,
conn);
- }
-
- private void cancelRequest(
- final NHttpClientConnection conn,
- final ClientConnState connState) throws IOException {
-
- int timeout = connState.getTimeout();
- conn.setSocketTimeout(timeout);
-
- conn.resetOutput();
- connState.resetOutput();
}
private boolean canResponseHaveBody(