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 2022/10/27 13:35:22 UTC
[httpcomponents-core] branch master updated (a24609fa1 -> 62c3bd3c0)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
omit a24609fa1 Bug fix: HTTP/1.1 must continue message processing as long as there is data in the session input buffer
new 62c3bd3c0 Bug fix: HTTP/1.1 protocol handler must continue message processing as long as there is data in the session input buffer
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a24609fa1)
\
N -- N -- N refs/heads/master (62c3bd3c0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java | 2 ++
1 file changed, 2 insertions(+)
[httpcomponents-core] 01/01: Bug fix: HTTP/1.1 protocol handler must continue message processing as long as there is data in the session input buffer
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 62c3bd3c078bf32131a3ce287e3816313b4de754
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Thu Oct 27 14:51:34 2022 +0200
Bug fix: HTTP/1.1 protocol handler must continue message processing as long as there is data in the session input buffer
---
.../java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java | 3 +--
.../org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
index 73eb29a19..46d5602a5 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/Http1IntegrationTest.java
@@ -131,7 +131,6 @@ import org.apache.hc.core5.util.TextUtils;
import org.apache.hc.core5.util.Timeout;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -738,7 +737,7 @@ public abstract class Http1IntegrationTest {
}
}
- @Test @Disabled("Fails intermittently on GitLab. Under investigation")
+ @Test
public void testExpectationFailed() throws Exception {
final Http1TestServer server = resources.server();
final Http1TestClient client = resources.client();
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 1438ee73d..21c6d1b00 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
@@ -335,8 +335,7 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
incomingMessage = null;
ioSession.setEvent(SelectionKey.OP_READ);
inputEnd();
- }
- if (bytesRead == 0) {
+ } else if (bytesRead == 0) {
break;
}
}