bug #35774 [Ldap] force default network timeout (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit a81cbc99c790 · 2020-02-19T17:02:56.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Ldap] force default network timeout | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - The default network timeout is infinite, which makes no sense and can block workers. Note that LDAP supports also "timelimit" options, but those are max-durations for LDAP queries. We cannot limit them by default. Commits ------- 63f9e01 [Ldap] force default network timeout
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Connection.php
@@ -107,6 +107,10 @@ protected function configureOptions(OptionsResolver $resolver)
                 $value['referrals'] = $options['referrals'];
             }
 
+            if (!isset($value['network_timeout'])) {
+                $value['network_timeout'] = ini_get('default_socket_timeout');
+            }
+
             return $value;
         });
 

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,10 @@ protected function configureOptions(OptionsResolver $resolver)`
`107`	`107`	`$value['referrals'] = $options['referrals'];`
`108`	`108`	`}`
`109`	`109`
	`110`	`+ if (!isset($value['network_timeout'])) {`
	`111`	`+ $value['network_timeout'] = ini_get('default_socket_timeout');`
	`112`	`+ }`
	`113`	`+`
`110`	`114`	`return $value;`
`111`	`115`	`});`
`112`	`116`