viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 15:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

websocket fixes

Browse Source
This commit is contained in:
yuri
2019-03-18 10:47:59 +02:00
parent 5dd014f835
commit e899781cb5
8 changed files with 60 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
websocket.php
View File

@@ -48,39 +48,28 @@ $pull->bind('tcp://127.0.0.1:5555');
$pull->on('message', [$pusher, 'onMessageReceive']);
$useSsl = false;
$port = null;
$webSocketUrl = $config->get('webSocketUrl');
if ($webSocketUrl) {
if (stripos($webSocketUrl, 'wss://') === 0) {
$useSsl = true;
}
$port = parse_url($webSocketUrl, \PHP_URL_PORT);
} else {
$siteUrl = $config->get('siteUrl');
if ($siteUrl && stripos($siteUrl, 'https://') === 0) {
$useSsl = true;
}
}
$useSecureServer = $config->get('webSocketUseSecureServer');
$port = $config->get('webSocketPort');
if (!$port) {
$port = $useSsl ? '8443' : '8080';
$port = $useSecureServer ? '8443' : '8080';
}
$webSocket = new \React\Socket\Server('0.0.0.0:'.$port, $loop);
if ($useSsl) {
$webSocket = new \React\Socket\SecureServer(
$webSocket,
$loop,
[
'local_cert' => $config->get('webSocketSslCertificateFile'),
'local_pk' => $config->get('webSocketSslCertificateKeyFile'),
'allow_self_signed' => $config->get('webSocketSslAllowSelfSigned', false),
'verify_peer' => false,
]
);
if ($useSecureServer) {
$sslParams = [
'local_cert' => $config->get('webSocketSslCertificateFile'),
'allow_self_signed' => $config->get('webSocketSslAllowSelfSigned', false),
'verify_peer' => false,
];
if ($config->get('webSocketSslCertificatePassphrase')) {
$sslParams['passphrase'] = $config->get('webSocketSslCertificatePassphrase');
}
if ($config->get('webSocketSslCertificateLocalPrivateKey')) {
$sslParams['local_pk'] = $config->get('webSocketSslCertificateLocalPrivateKey');
}
$webSocket = new \React\Socket\SecureServer($webSocket, $loop, $sslParams);
}
$webServer = new \Ratchet\Server\IoServer(