Skip to content

Commit 5584c85

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 c3f7884 + e417c8b commit 5584c85

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Adapter/ExtLdap/Connection.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ protected function configureOptions(OptionsResolver $resolver)
116116
$options->setDefault('debug_level', 7);
117117
}
118118

119+
if (!isset($parent['network_timeout'])) {
120+
$options->setDefault('network_timeout', ini_get('default_socket_timeout'));
121+
}
122+
119123
$options->setDefaults([
120124
'protocol_version' => $parent['version'],
121125
'referrals' => $parent['referrals'],

0 commit comments

Comments
 (0)