faeez/rfc6455
1
0
Fork 0
Code Issues Pull Requests Actions Packages Repo. Project Releases Wiki Activity

Fixed sub-protocol handling

Browse Source
This commit is contained in:
Chris Boden 2015-05-31 15:43:58 -04:00
parent e45cd158bd
commit d8babac7e7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Handshake/Negotiator.php
View File

@ -80,8 +80,9 @@ class Negotiator implements NegotiatorInterface {
} }
$headers = []; $headers = [];
if (count($this->_supportedSubProtocols) > 0) { $subProtocols = $request->getHeader('Sec-WebSocket-Protocol');
$subProtocols = $request->getHeader('Sec-WebSocket-Protocol'); if (count($subProtocols) > 0 || (count($this->_supportedSubProtocols) > 0 && $this->_strictSubProtocols)) {
$subProtocols = array_map('trim', explode(',', implode(',', $subProtocols)));
$match = array_reduce($subProtocols, function($accumulator, $protocol) { $match = array_reduce($subProtocols, function($accumulator, $protocol) {
return $accumulator ?: (isset($this->_supportedSubProtocols[$protocol]) ? $protocol : null); return $accumulator ?: (isset($this->_supportedSubProtocols[$protocol]) ? $protocol : null);
@ -91,14 +92,16 @@ class Negotiator implements NegotiatorInterface {
return new Response(400, [], '1.1', null ,'No Sec-WebSocket-Protocols requested supported'); return new Response(400, [], '1.1', null ,'No Sec-WebSocket-Protocols requested supported');
} }
$headers['Sec-WebSocket-Protocol'] = $match; if (null !== $match) {
$headers['Sec-WebSocket-Protocol'] = $match;
}
} }
return new Response(101, array_merge($headers, [ return new Response(101, array_merge($headers, [
'Upgrade' => 'websocket' 'Upgrade' => 'websocket'
, 'Connection' => 'Upgrade' , 'Connection' => 'Upgrade'
, 'Sec-WebSocket-Accept' => $this->sign((string)$request->getHeader('Sec-WebSocket-Key')[0]) , 'Sec-WebSocket-Accept' => $this->sign((string)$request->getHeader('Sec-WebSocket-Key')[0])
, 'X-Powered-By' => 'Ratchet' , 'X-Powered-By' => 'Ratchet'
])); ]));
} }