Skip to content

Commit 9e851b1

Browse files
Merge branch '4.4' into 5.0
* 4.4: (25 commits) [DoctrineBridge] Use new Types::* constants and support new json type [Debug][ErrorHandler] improved deprecation notices for methods new args and return type [BrowserKit] Nested file array prevents uploading file [ExpressionLanguage] Fixed collisions of character operators with object properties [Validator] Remove specific check for Valid targets [PhpUnitBridge] Use trait instead of extending deprecated class Fix versioned namespace clears fix remember me Use strict assertion in asset tests [DoctrineBridge][DoctrineExtractor] Fix indexBy with custom and some core types Do not rely on the current locale when dumping a Graphviz object fix typo [Ldap] force default network timeout [Config] don't throw on missing excluded paths Docs: Typo, grammar [Validator] Add the missing translations for the Polish ("pl") locale [PhpUnitBridge] Add compatibility to PHPUnit 9 #35662 [Routing] Add locale requirement for localized routes [Console] Inline exact-match handling with 4.4 Set previous exception when rethrown from controller resolver ...
2 parents c7f8a5b + 688baac commit 9e851b1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

CachingHttpClient.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public function __construct(HttpClientInterface $client, StoreInterface $store,
5555
unset($defaultOptions['allow_revalidate']);
5656
unset($defaultOptions['stale_while_revalidate']);
5757
unset($defaultOptions['stale_if_error']);
58+
unset($defaultOptions['trace_level']);
59+
unset($defaultOptions['trace_header']);
5860

5961
if ($defaultOptions) {
6062
[, $this->defaultOptions] = self::prepareRequest(null, null, $defaultOptions, $this->defaultOptions);

0 commit comments

Comments
 (0)