Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 272f021

Browse filesBrowse files
committed
Merge branch '7.0' into 7.1
* 7.0: [Mailer] Fix usage of stream_set_timeout in case of microseconds [Security] Update InteractiveAuthenticatorInterface description
2 parents b9cb68b + ffa4fa9 commit 272f021
Copy full SHA for 272f021

File tree

2 files changed

+3
-3
lines changed
Filter options

2 files changed

+3
-3
lines changed

‎src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php
+1-1Lines 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
}

‎src/Symfony/Component/Security/Http/Authenticator/InteractiveAuthenticatorInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/Authenticator/InteractiveAuthenticatorInterface.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* be used by interactive authenticators.
1717
*
1818
* Interactive login requires explicit user action (e.g. a login
19-
* form or HTTP basic authentication). Implementing this interface
20-
* will dispatch the InteractiveLoginEvent upon successful login.
19+
* form). Implementing this interface will dispatch the InteractiveLoginEvent
20+
* upon successful login.
2121
*
2222
* @author Wouter de Jong <wouter@wouterj.nl>
2323
*/

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.