bug symfony#16442 [LDAP] ldap_set_option should be called with a valid link identifier (pierredup)

fabpot · fabpot · commit 8c4e756c1b14 · 2015-11-05T14:32:43.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [LDAP] ldap_set_option should be called with a valid link identifier | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 7f89196 ldap_set_option should be called with a valid link identifier
diff --git a/src/Symfony/Component/Ldap/LdapClient.php b/src/Symfony/Component/Ldap/LdapClient.php
@@ -109,11 +109,11 @@ private function connect()
                 $host = 'ldaps://'.$host;
             }
 
+            $this->connection = ldap_connect($host, $this->port);
+
             ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $this->version);
             ldap_set_option($this->connection, LDAP_OPT_REFERRALS, $this->optReferrals);
 
-            $this->connection = ldap_connect($host, $this->port);
-
             if ($this->useStartTls) {
                 ldap_start_tls($this->connection);
             }

Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,11 @@ private function connect()`
`109`	`109`	`$host = 'ldaps://'.$host;`
`110`	`110`	`}`
`111`	`111`
	`112`	`+ $this->connection = ldap_connect($host, $this->port);`
	`113`	`+`
`112`	`114`	`ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $this->version);`
`113`	`115`	`ldap_set_option($this->connection, LDAP_OPT_REFERRALS, $this->optReferrals);`
`114`	`116`
`115`		`- $this->connection = ldap_connect($host, $this->port);`
`116`		`-`
`117`	`117`	`if ($this->useStartTls) {`
`118`	`118`	`ldap_start_tls($this->connection);`
`119`	`119`	`}`