Skip to content

Commit ead2a4a

Browse files
Merge branch '6.3' into 6.4
* 6.3: (27 commits) [Filesystem] Follow symlinks when dumping files [Security] Add clock dependency to OidcTokenHandler [DependencyInjection] Escape `%` from parameter-like default values [SecurityBundle] add missing xsd definition for OIDC [FrameworkBundle] remove support for preloading ESM modules using headers Fix tests [SecurityBundle] Fix configuring OIDC user info token handler client [Notifier] Fix ContactEveryoneOptions CS fix [FrameworkBundle][PhpUnitBridge] Configure doctrine/deprecations as expected [HttpKernel] Fix default value ignored with pinned resolvers Fix unable to use asset mapper with CSP Fix Typos Ignore definitions bearing the `container.excluded` tag Bump Symfony version to 6.3.0 Update VERSION for 6.3.0-RC2 Update CHANGELOG for 6.3.0-RC2 Bump Symfony version to 6.2.12 Update VERSION for 6.2.11 Update CHANGELOG for 6.2.11 ...
2 parents 5b9c53e + 7b03d9b commit ead2a4a

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
@@ -145,7 +145,7 @@ public function initialize(): void
145145
if ($this->streamContextOptions) {
146146
$options = array_merge($options, $this->streamContextOptions);
147147
}
148-
// do it unconditionnally as it will be used by STARTTLS as well if supported
148+
// do it unconditionally as it will be used by STARTTLS as well if supported
149149
$options['ssl']['crypto_method'] ??= \STREAM_CRYPTO_METHOD_TLS_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
150150
$streamContext = stream_context_create($options);
151151

0 commit comments

Comments
 (0)