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 2018/09/28 16:50:51 UTC
[1/3] httpcomponents-core git commit: Removed unnecessary if statement
Repository: httpcomponents-core
Updated Branches:
refs/heads/master 86ee1ec21 -> 31be6d63a
Removed unnecessary if statement
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/57dea3d7
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/57dea3d7
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/57dea3d7
Branch: refs/heads/master
Commit: 57dea3d742d52a2c08f32cb0511be12b810ab554
Parents: 86ee1ec
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Fri Sep 28 14:58:37 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Fri Sep 28 14:58:37 2018 +0200
----------------------------------------------------------------------
.../hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/57dea3d7/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
index 9972710..436ad3e 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
@@ -70,13 +70,13 @@ import org.apache.hc.core5.http.nio.SessionOutputBuffer;
import org.apache.hc.core5.http.nio.command.RequestExecutionCommand;
import org.apache.hc.core5.http.nio.command.ShutdownCommand;
import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.io.SocketTimeoutExceptionFactory;
import org.apache.hc.core5.reactor.Command;
import org.apache.hc.core5.reactor.EventMask;
import org.apache.hc.core5.reactor.ProtocolIOSession;
import org.apache.hc.core5.reactor.ssl.TlsDetails;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Identifiable;
-import org.apache.hc.core5.io.SocketTimeoutExceptionFactory;
abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage, OutgoingMessage extends HttpMessage>
implements Identifiable, HttpConnection {
@@ -301,9 +301,7 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
int bytesRead;
while ((bytesRead = contentDecoder.read(contentBuffer)) > 0) {
- if (bytesRead > 0) {
- totalBytesRead += bytesRead;
- }
+ totalBytesRead += bytesRead;
contentBuffer.flip();
final int capacity = consumeData(contentBuffer);
contentBuffer.clear();
[2/3] httpcomponents-core git commit: Prefer graceful to immediate
close mode
Posted by ol...@apache.org.
Prefer graceful to immediate close mode
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/5e3bd0ea
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/5e3bd0ea
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/5e3bd0ea
Branch: refs/heads/master
Commit: 5e3bd0ea8e160906eef1c22ba4eef9144fa594b8
Parents: 57dea3d
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Fri Sep 28 18:41:21 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Fri Sep 28 18:46:10 2018 +0200
----------------------------------------------------------------------
.../hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java | 2 +-
.../hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java | 2 +-
.../apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java | 2 +-
.../apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5e3bd0ea/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
index b4fc550..7e926af 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/ClientHttpProtocolNegotiator.java
@@ -158,7 +158,7 @@ public class ClientHttpProtocolNegotiator implements HttpConnectionEventHandler
startHttp2(session);
}
} else {
- session.close(CloseMode.IMMEDIATE);
+ session.close(CloseMode.GRACEFUL);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5e3bd0ea/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java
index 3082b30..1cf1a07 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/Http2OnlyClientProtocolNegotiator.java
@@ -126,7 +126,7 @@ public class Http2OnlyClientProtocolNegotiator implements HttpConnectionEventHan
if (preface != null) {
writePreface(session);
} else {
- session.close(CloseMode.IMMEDIATE);
+ session.close(CloseMode.GRACEFUL);
}
} catch (final IOException ex) {
session.close(CloseMode.IMMEDIATE);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5e3bd0ea/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
index 436ad3e..2937b8b 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
@@ -288,7 +288,7 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
if (bytesRead == -1 && !inbuf.hasData()) {
if (outputIdle() && inputIdle()) {
- requestShutdown(CloseMode.IMMEDIATE);
+ requestShutdown(CloseMode.GRACEFUL);
} else {
shutdownSession(new ConnectionClosedException("Connection closed by peer"));
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5e3bd0ea/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
index ab97c1a..c652b3e 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
@@ -116,7 +116,7 @@ public class ServerHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
@Override
public void close() {
- ServerHttp1StreamDuplexer.this.close(CloseMode.IMMEDIATE);
+ ServerHttp1StreamDuplexer.this.close(CloseMode.GRACEFUL);
}
@Override
[3/3] httpcomponents-core git commit: Consistent use of chunk size
hint parameter by HTTP/1.1 protocol handler
Posted by ol...@apache.org.
Consistent use of chunk size hint parameter by HTTP/1.1 protocol handler
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/31be6d63
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/31be6d63
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/31be6d63
Branch: refs/heads/master
Commit: 31be6d63a6aceea0f9fee5ad80601dda26d05920
Parents: 5e3bd0e
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Fri Sep 28 15:04:02 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Fri Sep 28 18:46:39 2018 +0200
----------------------------------------------------------------------
.../hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java | 4 ++--
.../hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/31be6d63/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
index 820ed7b..7b43f89 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
@@ -275,10 +275,10 @@ public class ClientHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
final WritableByteChannel channel,
final SessionOutputBuffer buffer,
final BasicHttpTransportMetrics metrics) throws HttpException {
+ final int chunkSizeHint = h1Config.getChunkSizeHint() >= 0 ? h1Config.getChunkSizeHint() : 2048;
if (len >= 0) {
- return new LengthDelimitedEncoder(channel, buffer, metrics, len, h1Config.getChunkSizeHint());
+ return new LengthDelimitedEncoder(channel, buffer, metrics, len, chunkSizeHint);
} else if (len == ContentLengthStrategy.CHUNKED) {
- final int chunkSizeHint = h1Config.getChunkSizeHint() >= 0 ? h1Config.getChunkSizeHint() : 2048;
return new ChunkEncoder(channel, buffer, metrics, chunkSizeHint);
} else {
throw new LengthRequiredException();
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/31be6d63/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
index c652b3e..bfc02d0 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
@@ -274,13 +274,13 @@ public class ServerHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
final WritableByteChannel channel,
final SessionOutputBuffer buffer,
final BasicHttpTransportMetrics metrics) throws HttpException {
+ final int chunkSizeHint = h1Config.getChunkSizeHint() >= 0 ? h1Config.getChunkSizeHint() : 2048;
if (len >= 0) {
- return new LengthDelimitedEncoder(channel, buffer, metrics, len, h1Config.getChunkSizeHint());
+ return new LengthDelimitedEncoder(channel, buffer, metrics, len, chunkSizeHint);
} else if (len == ContentLengthStrategy.CHUNKED) {
- final int chunkSizeHint = h1Config.getChunkSizeHint() >= 0 ? h1Config.getChunkSizeHint() : 2048;
return new ChunkEncoder(channel, buffer, metrics, chunkSizeHint);
} else {
- return new IdentityEncoder(channel, buffer, metrics, h1Config.getChunkSizeHint());
+ return new IdentityEncoder(channel, buffer, metrics, chunkSizeHint);
}
}