diff options
| author | Côme Bernigaud <mcmic@php.net> | 2015-09-09 10:34:46 +0200 |
|---|---|---|
| committer | Côme Bernigaud <mcmic@php.net> | 2015-09-09 10:34:46 +0200 |
| commit | a483a79c85dd4d2d169aa18a3d5904d7aad6146a (patch) | |
| tree | 123623ec070ee1bf41ee29d9dbb54e6606086ea6 /ext/ldap/ldap.c | |
| parent | 71da4f1f7f6b2ea51f85f2795f8297ba4fa720cb (diff) | |
| parent | cc7140e8d92616115659e586dc50d07c6b13bdcb (diff) | |
| download | php-git-a483a79c85dd4d2d169aa18a3d5904d7aad6146a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
Diffstat (limited to 'ext/ldap/ldap.c')
| -rw-r--r-- | ext/ldap/ldap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index bc1c7bcde6..bc7601fcc4 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -665,7 +665,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, in /* timelimit */ if (timelimit > -1) { #if (LDAP_API_VERSION >= 2004) || HAVE_NSLDAP || HAVE_ORALDAP - ldap_get_option(ldap, LDAP_OPT_SIZELIMIT, old_timelimit); + ldap_get_option(ldap, LDAP_OPT_TIMELIMIT, old_timelimit); ldap_set_option(ldap, LDAP_OPT_TIMELIMIT, &timelimit); #else *old_timelimit = ldap->ld_timelimit; @@ -676,7 +676,7 @@ static void php_set_opts(LDAP *ldap, int sizelimit, int timelimit, int deref, in /* deref */ if (deref > -1) { #if (LDAP_API_VERSION >= 2004) || HAVE_NSLDAP || HAVE_ORALDAP - ldap_get_option(ldap, LDAP_OPT_SIZELIMIT, old_deref); + ldap_get_option(ldap, LDAP_OPT_DEREF, old_deref); ldap_set_option(ldap, LDAP_OPT_DEREF, &deref); #else *old_deref = ldap->ld_deref; |