From 14ca7d981e4528b5ccafba3d71b10dd8866d061d Mon Sep 17 00:00:00 2001
From: Ivan Zbykovskyi <>
Date: Thu, 3 Feb 2022 13:34:02 +0200
Subject: [PATCH] Add formatting for SockJS close GoAway frame to prevent
 infinite loop for xhr-polling and xhr-streaming transport

---
 .../handler/AbstractHttpSendingTransportHandler.java          | 4 +++-
 .../sockjs/transport/session/AbstractHttpSockJsSession.java   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
index ef566c7f8db1..73aac7449e4d 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
@@ -79,9 +79,11 @@ else if (sockJsSession.isClosed()) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Connection already closed (but not removed yet) for " + sockJsSession);
 			}
+			SockJsFrameFormat frameFormat = this.getFrameFormat(request);
 			SockJsFrame frame = SockJsFrame.closeFrameGoAway();
+			String formattedFrame = frameFormat.format(frame);
 			try {
-				response.getBody().write(frame.getContentBytes());
+				response.getBody().write(formattedFrame.getBytes(SockJsFrame.CHARSET));
 			}
 			catch (IOException ex) {
 				throw new SockJsException("Failed to send " + frame, sockJsSession.getId(), ex);
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
index ce9786bc7585..ab0b8d2ac698 100644
--- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
+++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
@@ -257,7 +257,8 @@ public void handleSuccessiveRequest(ServerHttpRequest request, ServerHttpRespons
 		synchronized (this.responseLock) {
 			try {
 				if (isClosed()) {
-					response.getBody().write(SockJsFrame.closeFrameGoAway().getContentBytes());
+					String formattedFrame = frameFormat.format(SockJsFrame.closeFrameGoAway());
+					response.getBody().write(formattedFrame.getBytes(SockJsFrame.CHARSET));
 					return;
 				}
 				this.response = response;