Skip to content

Commit 48cde7b

Browse files
fix: prevent warning of fsockopen
Revert previous change. Signed-off-by: Vitor Mattos <vitor@php.rio>
1 parent d490ea8 commit 48cde7b

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

lib/Handler/CertificateEngine/CfsslHandler.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,15 @@ private function wakeUp(): void {
288288
private function portOpen(): bool {
289289
$host = parse_url($this->getCfsslUri(), PHP_URL_HOST);
290290
$port = parse_url($this->getCfsslUri(), PHP_URL_PORT);
291-
$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
292-
if (!$socket) {
291+
292+
set_error_handler(function () { });
293+
$socket = fsockopen($host, $port, $errno, $errstr, 0.1);
294+
restore_error_handler();
295+
if (!$socket || $errno || $errstr) {
293296
return false;
294297
}
295-
socket_set_option($socket, SOL_SOCKET, SO_RCVTIMEO, ['sec' => 0, 'usec' => 100000]); // 100ms
296-
socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, ['sec' => 0, 'usec' => 100000]);
297-
return @socket_connect($socket, $host, $port);
298+
fclose($socket);
299+
return true;
298300
}
299301

300302
private function getServerPid(): int {

tests/psalm-baseline.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
<code><![CDATA[addServiceListener]]></code>
6767
</InvalidArgument>
6868
</file>
69+
<file src="lib/Handler/CertificateEngine/CfsslHandler.php">
70+
<InvalidArgument>
71+
<code><![CDATA[function () { }]]></code>
72+
</InvalidArgument>
73+
</file>
6974
<file src="lib/Helper/Pagination.php">
7075
<MissingTemplateParam>
7176
<code><![CDATA[Pagination]]></code>

0 commit comments

Comments
 (0)