com php-src: Revert "Added back support for undocummented host:port syntax": ext/ldap/ldap.c ext/ldap/tests/ldap_connect_variat ion.phpt
| From: | Côme Bernigaud | Date: | Tue, 24 Nov 2015 02:45:21 +0000 |
| Subject: | com php-src: Revert "Added back support for undocummented host:port syntax": ext/ldap/ldap.c ext/ldap/tests/ldap_connect_variat ion.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89983@lists.php.net to get a copy of this message | ||
Commit: e6759644ec8cb548e48c124aaf13fe87f7ab3cc4
Author: Côme Bernigaud <mcmic@php.net> Mon, 23 Nov 2015 03:08:25 +0100
Parents: 5a8bcf73ba5aa381a5440c22780504e5d809b995
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e6759644ec8cb548e48c124aaf13fe87f7ab3cc4
Log:
Revert "Added back support for undocummented host:port syntax"
This reverts commit 15876e85e59658bfbda3bf0b0c34d56ca503fd2f.
Changed paths:
M ext/ldap/ldap.c
M ext/ldap/tests/ldap_connect_variation.phpt
Diff:
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 4ff6534..e0faf24 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 eaee261..09b07e7 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===