UNDERTOW-2279 investigation

.github/workflows/ci.yml

@@ -57,8 +57,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        module: [core, servlet, websockets-jsr]
+        os: [windows-latest]
+        module: [core]
         jdk: [11, 17]
         openjdk_impl: [ temurin ]
     steps:
@@ -103,63 +103,11 @@ jobs:
     - name: Print Version
       run: mvn -v
     - name: Run Tests
-      run: mvn -U -B -fae test -Pproxy '-DfailIfNoTests=false' -pl ${{ matrix.module }}
+      run: mvn -U -B -fae test -Pproxy -Dtest=LotsOfHeadersResponseTestCase '-DfailIfNoTests=false' -pl ${{ matrix.module }}
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
         name: surefire-reports-${{ matrix.jdk }}-${{ matrix.module }}-${{ matrix.os }}
         path: |
               **/surefire*-reports/*.txt
               **/*.dump*
-  test-matrix-ipv6:
-    name: JDK ${{ matrix.jdk }} - ipv6 - ${{ matrix.module }} ${{ matrix.proxy }} - ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    needs: build-all
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        module: [core, servlet, websockets-jsr]
-        proxy: ['-Pproxy', '']
-        jdk: [11]
-    steps:
-    - name: Update hosts - linux
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        sudo bash -c "echo '127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4' > /etc/hosts"
-        sudo bash -c "echo '::1         localhost localhost.localdomain localhost6 localhost6.localdomain6' >> /etc/hosts"
-        sudo sysctl -w fs.file-max=2097152
-    - uses: n1hility/cancel-previous-runs@v2
-      with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Host information
-      run: |
-       hostname || true
-    - uses: actions/checkout@v2
-    - name: Download Maven Repo
-      uses: actions/download-artifact@v1
-      with:
-        name: maven-repo
-        path: .
-    - name: Extract Maven Repo
-      shell: bash
-      run: tar -xzf maven-repo.tgz -C ~
-    - name: Set up JDK ${{ matrix.java }}
-      uses: joschi/setup-jdk@v2
-      with:
-        java-version: ${{ matrix.jdk }}
-    - name: Generate settings.xml for Maven Builds
-      uses: whelk-io/maven-settings-xml-action@v20
-      with:
-        repositories: '[{ "id": "jboss", "name": "JBoss", "url": "https://repository.jboss.org/nexus/content/groups/public" }]'
-    - name: Print Version
-      run: mvn -v
-    - name: Run Tests
-      run: mvn -U -B -fae test ${{ matrix.proxy }} '-DfailIfNoTests=false' -pl ${{ matrix.module }} -Dtest.ipv6=true
-    - uses: actions/upload-artifact@v2
-      if: failure()
-      with:
-        name: surefire-reports-${{ matrix.jdk }}-ipv6-${{ matrix.module }}${{ matrix.proxy }}-${{ matrix.os }}
-        path: |
-          **/surefire*-reports/*.txt
-          **/*.dump*

core/src/main/java/io/undertow/conduits/ChunkedStreamSinkConduit.java

@@ -301,23 +301,35 @@ public void terminateWrites() throws IOException {
         if(anyAreSet(state, FLAG_WRITES_SHUTDOWN)) {
             return;
         }
-        if (this.chunkleft != 0) {
-            UndertowLogger.REQUEST_IO_LOGGER.debugf("Channel closed mid-chunk");
-            next.truncateWrites();
-        }
         if (!anyAreSet(state, FLAG_FIRST_DATA_WRITTEN)) {
             //if no data was actually sent we just remove the transfer encoding header, and set content length 0
             //TODO: is this the best way to do it?
             //todo: should we make this behaviour configurable?
             responseHeaders.put(Headers.CONTENT_LENGTH, "0"); //according to the spec we don't actually need this, but better to be safe
             responseHeaders.remove(Headers.TRANSFER_ENCODING);
             state |= FLAG_NEXT_SHUTDOWN | FLAG_WRITES_SHUTDOWN;
+            try {
+                flush();
+            } catch (IOException ignore) {
+                // just log it at debug level, this is nothing but an attempt to flush the last bytes
+                UndertowLogger.REQUEST_IO_LOGGER.ioException(ignore);
+            }
             if(anyAreSet(state, CONF_FLAG_PASS_CLOSE)) {
                 next.terminateWrites();
             }
         } else {
             createLastChunk(false);
             state |= FLAG_WRITES_SHUTDOWN;
+            try {
+                flush();
+            } catch (IOException ignore) {
+                // just log it at debug level, this is nothing but an attempt to flush the last bytes
+                UndertowLogger.REQUEST_IO_LOGGER.ioException(ignore);
+            }
+        }
+        if (this.chunkleft != 0) {
+            UndertowLogger.REQUEST_IO_LOGGER.debugf("Channel closed mid-chunk");
+            next.truncateWrites();
         }
     }
 

core/src/main/java/io/undertow/conduits/WriteTimeoutStreamSinkConduit.java

@@ -98,6 +98,8 @@ private void handleWriteTimeout(final long ret) throws IOException {
         long currentTime = System.currentTimeMillis();
         long expireTimeVar = expireTime;
         if (expireTimeVar != -1 && currentTime > expireTimeVar) {
+            this.expireTime = -1;
+            connection.getSinkChannel().shutdownWrites();
             IoUtils.safeClose(connection);
             throw new ClosedChannelException();
         }