Add support for Sec-WebSocket-Protocol header

nanawel · Sep 15, 2018 · 0261432 · 0261432
1 parent 27e7b00
commit 0261432
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/cli/ws.php b/cli/ws.php
@@ -105,20 +105,21 @@ function alloc($socket) {
 			return;
 		}
 		// Handshake
-		$bytes=$this->write(
-			$socket,
-			$str='HTTP/1.1 101 Switching Protocols'.$CRLF.
-				'Upgrade: websocket'.$CRLF.
-				'Connection: Upgrade'.$CRLF.
-				'Sec-WebSocket-Accept: '.
-					base64_encode(
-						sha1(
-							$hdrs['Sec-Websocket-Key'].
-							self::Magic,
-							TRUE
-						)
-					).$CRLF.$CRLF
-		);
+		$str='HTTP/1.1 101 Switching Protocols'.$CRLF.
+			'Upgrade: websocket'.$CRLF.
+			'Connection: Upgrade'.$CRLF;
+		if (isset($hdrs['Sec-Websocket-Protocol']))
+			$str.='Sec-WebSocket-Protocol: '.
+				$hdrs['Sec-Websocket-Protocol'].$CRLF;
+		$str.='Sec-WebSocket-Accept: '.
+			base64_encode(
+				sha1(
+					$hdrs['Sec-Websocket-Key'].
+					self::Magic,
+					TRUE
+				)
+			).$CRLF.$CRLF;
+		$bytes=$this->write($socket,$str);
 		if ($bytes) {
 			// Connect agent to server
 			$this->sockets[]=$socket;