Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
505c4e35
Commit
505c4e35
authored
Sep 05, 2020
by
Carsten Rose
Browse files
Refs #11076. Activates 'ssl' for 'wss' sockets.
parent
f07a0c9d
Pipeline
#3756
passed with stages
in 4 minutes and 12 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
extension/Classes/Core/Report/Link.php
View file @
505c4e35
...
...
@@ -30,7 +30,6 @@ use IMATHUZH\Qfq\Core\Helper\Support;
use
IMATHUZH\Qfq\Core\Helper\Token
;
use
IMATHUZH\Qfq\Core\Store\Sip
;
use
IMATHUZH\Qfq\Core\Store\Store
;
use
IMATHUZH\Qfq\Core\Report\WebSocket
;
/*
* a:AltText
...
...
@@ -547,6 +546,14 @@ class Link {
,
ERROR_MISSING_VALUE
);
}
// Check for wss >> ssl
if
(
$urlParts
[
'scheme'
]
==
'wss'
)
{
$urlParts
[
'host'
]
=
'ssl://'
.
$urlParts
[
'host'
];
if
(
$urlParts
[
'port'
]
==
0
)
{
$urlParts
[
'port'
]
=
443
;
}
}
// Open Socket
if
(
false
===
$websocket
->
connect
(
$urlParts
[
'host'
],
$urlParts
[
'port'
],
$urlParts
[
'path'
]))
{
throw
new
\
UserFormException
(
json_encode
([
ERROR_MESSAGE_TO_USER
=>
'Failed connect websocket'
,
...
...
extension/Classes/Core/Report/WebSocket.php
View file @
505c4e35
...
...
@@ -62,6 +62,7 @@ class WebSocket {
* @return bool
*/
public
function
sendData
(
string
$data
,
string
$type
=
'text'
,
bool
$masked
=
true
)
{
if
(
$this
->
connected
===
false
)
{
trigger_error
(
"Not connected"
,
E_USER_WARNING
);
return
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment