[tomcat] branch master updated: Compromise with the window update

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 40b5ce0  Compromise with the window update
40b5ce0 is described below

commit 40b5ce0f3ddc9441eba455b461fd22d36466e0b8
Author: remm <r...@apache.org>
AuthorDate: Wed Mar 4 17:08:09 2020 +0100

    Compromise with the window update
---
 test/org/apache/coyote/http2/TestLargeUpload.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
index ce366ce..7acedaa 100644
--- a/test/org/apache/coyote/http2/TestLargeUpload.java
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -36,18 +36,19 @@ import org.apache.coyote.http11.AbstractHttp11Protocol;
 
 public class TestLargeUpload extends Http2TestBase {
 
+    int bodySize = 13107;
+    int bodyCount = 5;
+
+    volatile int read = 0;
+    CountDownLatch done = new CountDownLatch(1);
+
     @Test
     public void testLargePostRequest() throws Exception {
-        // FIXME: Skip test for now, some control flow errors with non async
-        org.junit.Assume.assumeFalse(true);
 
         http2Connect(true);
 
         ((AbstractHttp11Protocol<?>) 
http2Protocol.getHttp11Protocol()).setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
 
-        int bodySize = 15000;
-        int bodyCount = 100;
-
         byte[] headersFrameHeader = new byte[9];
         ByteBuffer headersPayload = ByteBuffer.allocate(128);
         byte[] dataFrameHeader = new byte[9];
@@ -90,9 +91,6 @@ public class TestLargeUpload extends Http2TestBase {
         tomcat.start();
     }
 
-    volatile int read = 0;
-    CountDownLatch done = new CountDownLatch(1);
-
     private class DataReadServlet extends SimpleServlet {
 
         private static final long serialVersionUID = 1L;
@@ -107,7 +105,7 @@ public class TestLargeUpload extends Http2TestBase {
                 n = is.read(buf);
             }
             done.countDown();
-            if (read < 16384 * 20) {
+            if (read != bodySize * bodyCount) {
                 resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
             } else {
                 resp.setStatus(HttpServletResponse.SC_OK);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org