Skip to content

Commit ddd9e6d

Browse files
Merge branch '4.3' into 4.4
* 4.3: [Mailer] Remove line breaks in email attachment content Update links to documentation [Validator] Add the missing translations for the Arabic (ar) locale ensure to expect no validation for the right reasons [PhpUnitBridge] Add test case for @expectedDeprecation annotation [PhpUnitBridge][SymfonyTestsListenerTrait] Remove $testsWithWarnings stack [Mailer][MailchimpBridge] Fix missing attachments when sending via Mandrill API [Mailer][MailchimpBridge] Fix incorrect sender address when sender has name [HttpClient] fix capturing SSL certificates with NativeHttpClient [TwigBridge][Form] Added missing help messages in form themes Update year in license files Update year in license files [HttpClient] fix typo [Console][FormatterHelper] Use helper strlen statically and remove duplicated code [Routing] Fix i18n routing when the url contains the locale Fix BC issue in phpDoc Reflection library [Translator] Performance improvement in MessageCatalogue and catalogue operations.
2 parents bce7f95 + a99d2fb commit ddd9e6d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2018-2019 Fabien Potencier
1+
Copyright (c) 2018-2020 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

NativeHttpClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ private static function createRedirectResolver(array $options, string $host, ?ar
357357
});
358358

359359
if (isset($options['normalized_headers']['authorization']) || isset($options['normalized_headers']['cookie'])) {
360-
$redirectHeaders['no_auth'] = array_filter($options['headers'], static function ($h) {
360+
$redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], static function ($h) {
361361
return 0 !== stripos($h, 'Authorization:') && 0 !== stripos($h, 'Cookie:');
362362
});
363363
}

Response/NativeResponse.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ private function open(): void
162162
restore_error_handler();
163163
}
164164

165-
stream_set_blocking($h, false);
166-
$this->context = $this->resolveRedirect = null;
167-
168-
if (isset($context['ssl']['peer_certificate_chain'])) {
165+
if (isset($context['ssl']['capture_peer_cert_chain']) && isset(($context = stream_context_get_options($this->context))['ssl']['peer_certificate_chain'])) {
169166
$this->info['peer_certificate_chain'] = $context['ssl']['peer_certificate_chain'];
170167
}
171168

169+
stream_set_blocking($h, false);
170+
$this->context = $this->resolveRedirect = null;
171+
172172
// Create dechunk and inflate buffers
173173
if (isset($this->headers['content-length'])) {
174174
$this->remaining = (int) $this->headers['content-length'][0];

0 commit comments

Comments
 (0)