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

Merge branch 'dev' of github.com:cboden/Ratchet into dev

Browse Source 
Conflicts:
	lib/Ratchet/Protocol/WebSocket.php
This commit is contained in:
Chris Boden 2011-11-08 09:37:57 -05:00
commit b31a65a99a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Ratchet/Protocol/WebSocket.php
View File

@ -126,6 +126,7 @@ class WebSocket implements ProtocolInterface {
if ($command instanceof SendMessage) { if ($command instanceof SendMessage) {
$version = $this->_clients[$command->getSocket()]->getVersion(); $version = $this->_clients[$command->getSocket()]->getVersion();
return $command->setMessage($version->frame($command->getMessage())); return $command->setMessage($version->frame($command->getMessage()));
<<<<<<< HEAD
} }
if ($command instanceof \Traversable) { if ($command instanceof \Traversable) {
@ -134,6 +135,16 @@ class WebSocket implements ProtocolInterface {
} }
} }
=======
}
if ($command instanceof \Traversable) {
foreach ($command as $cmd) {
$cmd = $this->prepareCommand($cmd);
}
}
>>>>>>> 1d14119bb5582cf8ebfd7c506cbb93f3368ce852
return $command; return $command;
} }