1 files changed, 5 insertions, 1 deletions
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java
index 79f0f209b9..f42067df2a 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java
@@ -43,7 +43,11 @@ public class ControlFrameBytes<C> extends FrameBytes<C>
         if (frame.getOpCode() == OpCode.CLOSE)
         {
             // Disconnect the connection (no more packets/frames)
-            connection.disconnect(true); // FIXME (should only shutdown output here)
+            connection.disconnect(false);
+        }
+        else
+        {
+            connection.flush();
         }
     }