diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-16 17:59:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-11-16 17:59:46 +0800 |
| commit | 9134f9e98f6ccf8ed91cd1271fee7855062c07ff (patch) | |
| tree | de92106b2946eee73b51643504a2bcdc235e0fcc /ext/ldap/ldap.c | |
| parent | 0dce4bef7933920ef151f1f2ef7416f6a5da2afb (diff) | |
| parent | 25439e939e8d6a86bcc1654221460851b43271d5 (diff) | |
| download | php-git-9134f9e98f6ccf8ed91cd1271fee7855062c07ff.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/mysql/php_mysql.c
Diffstat (limited to 'ext/ldap/ldap.c')
| -rw-r--r-- | ext/ldap/ldap.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index f4dc087fac..9eaad2d878 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -368,7 +368,12 @@ PHP_FUNCTION(ldap_connect) } url = emalloc(urllen); - snprintf( url, urllen, "ldap://%s:%ld", host ? host : "", port ); + 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 ); + } } #ifdef LDAP_API_FEATURE_X_OPENLDAP |