summaryrefslogtreecommitdiff
path: root/ext/ldap/ldap.c
diff options
context:
space:
mode:
authorCôme Bernigaud <mcmic@php.net>2015-11-23 03:08:25 +0100
committerCôme Bernigaud <mcmic@php.net>2015-11-24 03:45:21 +0100
commite6759644ec8cb548e48c124aaf13fe87f7ab3cc4 (patch)
tree8d7b63316eec7d9e9e4e9d0563b442984d457c61 /ext/ldap/ldap.c
parent5a8bcf73ba5aa381a5440c22780504e5d809b995 (diff)
downloadphp-git-e6759644ec8cb548e48c124aaf13fe87f7ab3cc4.tar.gz
Revert "Added back support for undocummented host:port syntax"
This reverts commit 15876e85e59658bfbda3bf0b0c34d56ca503fd2f.
Diffstat (limited to 'ext/ldap/ldap.c')
-rw-r--r--ext/ldap/ldap.c7
1 files changed, 1 insertions, 6 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