diff options
| author | Côme Bernigaud <mcmic@php.net> | 2015-11-23 03:08:25 +0100 |
|---|---|---|
| committer | Côme Bernigaud <mcmic@php.net> | 2015-11-24 03:45:21 +0100 |
| commit | e6759644ec8cb548e48c124aaf13fe87f7ab3cc4 (patch) | |
| tree | 8d7b63316eec7d9e9e4e9d0563b442984d457c61 | |
| parent | 5a8bcf73ba5aa381a5440c22780504e5d809b995 (diff) | |
| download | php-git-e6759644ec8cb548e48c124aaf13fe87f7ab3cc4.tar.gz | |
Revert "Added back support for undocummented host:port syntax"
This reverts commit 15876e85e59658bfbda3bf0b0c34d56ca503fd2f.
| -rw-r--r-- | ext/ldap/ldap.c | 7 | ||||
| -rw-r--r-- | ext/ldap/tests/ldap_connect_variation.phpt | 5 |
2 files changed, 1 insertions, 11 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 4ff6534227..e0faf24b16 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -365,12 +365,7 @@ PHP_FUNCTION(ldap_connect) } url = emalloc(urllen); - if (host && (strchr(host, ':') != NULL)) { - /* Legacy support for host:port */ - snprintf( url, urllen, "ldap://%s", host ); - } else { - snprintf( url, urllen, "ldap://%s:%ld", host ? host : "", port ); - } + snprintf( url, urllen, "ldap://%s:%ld", host ? host : "", port ); } #ifdef LDAP_API_FEATURE_X_OPENLDAP diff --git a/ext/ldap/tests/ldap_connect_variation.phpt b/ext/ldap/tests/ldap_connect_variation.phpt index eaee261542..09b07e7786 100644 --- a/ext/ldap/tests/ldap_connect_variation.phpt +++ b/ext/ldap/tests/ldap_connect_variation.phpt @@ -28,10 +28,6 @@ var_dump($link); // bad hostname (connect should work, not bind) $link = ldap_connect("nonexistent" . $host); var_dump($link); - -// Legacy host:port syntax -$link = ldap_connect("$host:$port"); -var_dump($link); ?> ===DONE=== --EXPECTF-- @@ -40,5 +36,4 @@ resource(%d) of type (ldap link) resource(%d) of type (ldap link) resource(%d) of type (ldap link) resource(%d) of type (ldap link) -resource(%d) of type (ldap link) ===DONE=== |