Fix broken client tls negotiation (#11999)

#11965 make EMPTY_BUFFER not read-only anymore Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Jul 10, 2024 · 8f5207e · 8f5207e
1 parent d8f2a81
commit 8f5207e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/Content.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/Content.java
@@ -1024,7 +1024,7 @@ default int skip(int length)
          */
         default Chunk asReadOnly()
         {
-            if (getByteBuffer().isReadOnly())
+            if (!getByteBuffer().hasRemaining() || getByteBuffer().isReadOnly())
                 return this;
             if (canRetain())
                 return asChunk(getByteBuffer().asReadOnlyBuffer(), isLast(), this);

diff --git a/...uic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicStreamEndPoint.java b/...uic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicStreamEndPoint.java
@@ -42,7 +42,6 @@ public class QuicStreamEndPoint extends AbstractEndPoint
 {
     private static final Logger LOG = LoggerFactory.getLogger(QuicStreamEndPoint.class);
     private static final ByteBuffer LAST_FLAG = ByteBuffer.allocate(0);
-    private static final ByteBuffer EMPTY_WRITABLE_BUFFER = ByteBuffer.allocate(0);
 
     private final QuicSession session;
     private final long streamId;
@@ -272,7 +271,7 @@ public boolean onReadable()
                 // Check if the stream was finished normally.
                 try
                 {
-                    fill(EMPTY_WRITABLE_BUFFER);
+                    fill(BufferUtil.EMPTY_BUFFER);
                 }
                 catch (EOFException x)
                 {

diff --git a/...core/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java b/...core/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java
@@ -14,21 +14,20 @@
 package org.eclipse.jetty.server;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.util.List;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 
 import org.eclipse.jetty.io.AbstractConnection;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.util.BufferUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public abstract class NegotiatingServerConnection extends AbstractConnection
 {
     private static final Logger LOG = LoggerFactory.getLogger(NegotiatingServerConnection.class);
-    private static final ByteBuffer EMPTY_WRITABLE_BUFFER = ByteBuffer.allocate(0);
 
     public interface CipherDiscriminator
     {
@@ -145,7 +144,7 @@ private int fill()
     {
         try
         {
-            return getEndPoint().fill(EMPTY_WRITABLE_BUFFER);
+            return getEndPoint().fill(BufferUtil.EMPTY_BUFFER);
         }
         catch (IOException x)
         {

diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
@@ -107,7 +107,7 @@ public class BufferUtil
         };
 
     public static final byte[] EMPTY_BYTES = new byte[0];
-    public static final ByteBuffer EMPTY_BUFFER = ByteBuffer.wrap(EMPTY_BYTES).asReadOnlyBuffer();
+    public static final ByteBuffer EMPTY_BUFFER = ByteBuffer.wrap(EMPTY_BYTES);
 
     /**
      * Allocate ByteBuffer in flush mode.