Merge branch '2.5.x'

Closes gh-27205
spring-projects · Jul 8, 2021 · cf5fc04 · cf5fc04
2 parents 3fef0bd + f32f4a2
commit cf5fc04
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java b/...-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java
@@ -23,7 +23,6 @@
 import java.net.SocketTimeoutException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -44,7 +43,8 @@ class Connection {
 
 	private static final Log logger = LogFactory.getLog(Connection.class);
 
-	private static final Pattern WEBSOCKET_KEY_PATTERN = Pattern.compile("^sec-websocket-key:(.*)$", Pattern.MULTILINE);
+	private static final Pattern WEBSOCKET_KEY_PATTERN = Pattern.compile("^sec-websocket-key:(.*)$",
+			Pattern.MULTILINE | Pattern.CASE_INSENSITIVE);
 
 	public static final String WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
 
@@ -73,18 +73,19 @@ class Connection {
 		this.outputStream = new ConnectionOutputStream(outputStream);
 		String header = this.inputStream.readHeader();
 		logger.debug(LogMessage.format("Established livereload connection [%s]", header));
-		this.header = header.toLowerCase(Locale.ENGLISH);
+		this.header = header;
 	}
 
 	/**
 	 * Run the connection.
 	 * @throws Exception in case of errors
 	 */
 	void run() throws Exception {
-		if (this.header.contains("upgrade: websocket") && this.header.contains("sec-websocket-version: 13")) {
+		String lowerCaseHeader = this.header.toLowerCase();
+		if (lowerCaseHeader.contains("upgrade: websocket") && lowerCaseHeader.contains("sec-websocket-version: 13")) {
 			runWebSocket();
 		}
-		if (this.header.contains("get /livereload.js")) {
+		if (lowerCaseHeader.contains("get /livereload.js")) {
 			this.outputStream.writeHttp(getClass().getResourceAsStream("livereload.js"), "text/javascript");
 		}
 	}