bug #28499 [Ldap] Use shut up operator on connection errors at ldap_start_tls (Andras Debreczeni)

nicolas-grekas · nicolas-grekas · commit c75b1edf7890 · 2018-09-18T10:04:20.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Ldap] Use shut up operator on connection errors at ldap_start_tls | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #28426 | License | MIT | Doc PR | n/a Added shut-up operator to php function `ldap_start_tls()` so connection errors are ignored. Commits ------- af54189 [Ldap] Use shut up operator on connection errors at ldap_start_tls
diff --git a/src/Symfony/Component/Ldap/LdapClient.php b/src/Symfony/Component/Ldap/LdapClient.php
@@ -136,7 +136,7 @@ private function connect()
             ldap_set_option($this->connection, LDAP_OPT_REFERRALS, $this->optReferrals);
 
             if ($this->useStartTls) {
-                ldap_start_tls($this->connection);
+                @ldap_start_tls($this->connection);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private function connect()`
`136`	`136`	`ldap_set_option($this->connection, LDAP_OPT_REFERRALS, $this->optReferrals);`
`137`	`137`
`138`	`138`	`if ($this->useStartTls) {`
`139`		`- ldap_start_tls($this->connection);`
	`139`	`+ @ldap_start_tls($this->connection);`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`	`}`