yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 18:29:40 +02:00
Code Issues Releases Wiki Activity

Move from React 0.4.0 to 0.3.4 for PHP 5.3 compatibility reasons

Browse source
This commit is contained in:
Afterster 2014-04-13 08:58:34 +02:00
parent d3f01a3bc7
commit 7f82bea13e
50 changed files with 608 additions and 1937 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/React/SocketClient/StreamEncryption.php
View file

@ -2,6 +2,7 @@
namespace React\SocketClient;
use React\Promise\ResolverInterface;
use React\Promise\Deferred;
use React\Stream\Stream;
use React\EventLoop\LoopInterface;
@ -46,15 +47,16 @@ class StreamEncryption
// get actual stream socket from stream instance
$socket = $stream->stream;
$toggleCrypto = function () use ($socket, $deferred, $toggle) {
$this->toggleCrypto($socket, $deferred, $toggle);
$that = $this;
$toggleCrypto = function () use ($that, $socket, $deferred, $toggle) {
$that->toggleCrypto($socket, $deferred, $toggle);
};
$this->loop->addWriteStream($socket, $toggleCrypto);
$this->loop->addReadStream($socket, $toggleCrypto);
$toggleCrypto();
return $deferred->promise()->then(function () use ($stream) {
return $deferred->then(function () use ($stream) {
$stream->resume();
return $stream;
}, function($error) use ($stream) {
@ -63,7 +65,7 @@ class StreamEncryption
});
}
public function toggleCrypto($socket, Deferred $deferred, $toggle)
public function toggleCrypto($socket, ResolverInterface $resolver, $toggle)
{
set_error_handler(array($this, 'handleError'));
$result = stream_socket_enable_crypto($socket, $toggle, $this->method);
@ -73,12 +75,12 @@ class StreamEncryption
$this->loop->removeWriteStream($socket);
$this->loop->removeReadStream($socket);
$deferred->resolve();
$resolver->resolve();
} else if (false === $result) {
$this->loop->removeWriteStream($socket);
$this->loop->removeReadStream($socket);
$deferred->reject(new UnexpectedValueException(
$resolver->reject(new UnexpectedValueException(
sprintf("Unable to complete SSL/TLS handshake: %s", $this->errstr),
$this->errno
));