Merge branch 'master' into 3.0-merge

limingxinleo · limingxinleo · commit 5a7189ea9857 · 2022-02-21T10:03:25.000+08:00
# Conflicts:
#	.github/workflows/test.yml
#	composer.json
#	phpunit.xml
#	src/config-apollo/src/Client.php
#	src/http-server/src/Request.php
#	src/redis/src/RedisConnection.php
#	src/utils/composer.json
diff --git a/src/Security.php b/src/Security.php
@@ -19,9 +19,9 @@ class Security
 
     public const KEY = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11';
 
-    public const SEC_WEBSOCKET_KEY = 'Sec-Websocket-Key';
+    public const SEC_WEBSOCKET_KEY = 'sec-websocket-key';
 
-    public const SEC_WEBSOCKET_PROTOCOL = 'Sec-WebSocket-Protocol';
+    public const SEC_WEBSOCKET_PROTOCOL = 'sec-webSocket-protocol';
 
     public function isInvalidSecurityKey(string $key): bool
     {

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ class Security`
`19`	`19`
`20`	`20`	`public const KEY = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11';`
`21`	`21`
`22`		`- public const SEC_WEBSOCKET_KEY = 'Sec-Websocket-Key';`
	`22`	`+ public const SEC_WEBSOCKET_KEY = 'sec-websocket-key';`
`23`	`23`
`24`		`- public const SEC_WEBSOCKET_PROTOCOL = 'Sec-WebSocket-Protocol';`
	`24`	`+ public const SEC_WEBSOCKET_PROTOCOL = 'sec-webSocket-protocol';`
`25`	`25`
`26`	`26`	`public function isInvalidSecurityKey(string $key): bool`
`27`	`27`	`{`