Skip to content

Commit 869c114

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: [Mailer] Fix usage of stream_set_timeout in case of microseconds [Console] Allow false as a $shortcut in InputOption Remove 6.3 EOLed from Github template Fix plurial of word ending by pus [Notifier][Smsapi] Better docs for .com endpoint Bump Symfony version to 5.4.36 Update VERSION for 5.4.35 Update CONTRIBUTORS for 5.4.35 Update CHANGELOG for 5.4.35 [Security] Update InteractiveAuthenticatorInterface description
2 parents 3cbb745 + b57d722 commit 869c114

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Transport/Smtp/Stream/SocketStream.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function initialize(): void
160160
}
161161

162162
stream_set_blocking($this->stream, true);
163-
stream_set_timeout($this->stream, $timeout);
163+
stream_set_timeout($this->stream, (int) $timeout, (int) (($timeout - (int) $timeout) * 1000000));
164164
$this->in = &$this->stream;
165165
$this->out = &$this->stream;
166166
}

0 commit comments

Comments
 (0)