com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/ldap/ldap.c
| From: | Côme Bernigaud | Date: | Wed, 09 Sep 2015 08:34:46 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/ldap/ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88971@lists.php.net to get a copy of this message | ||
Commit: a483a79c85dd4d2d169aa18a3d5904d7aad6146a
Author: Côme Bernigaud <mcmic@php.net> Wed, 9 Sep 2015 10:34:46 +0200
Parents: 71da4f1f7f6b2ea51f85f2795f8297ba4fa720cb cc7140e8d92616115659e586dc50d07c6b13bdcb
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a483a79c85dd4d2d169aa18a3d5904d7aad6146a
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
Changed paths:
MM ext/ldap/ldap.c
Diff:
diff --cc ext/ldap/ldap.c
index bc1c7bc,b3b8884..bc7601f
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@@ -665,22 -600,22 +665,22 @@@ static void php_set_opts(LDAP *ldap, 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;
- ldap->ld_timelimit = timelimit;
+ *old_timelimit = ldap->ld_timelimit;
+ ldap->ld_timelimit = timelimit;
#endif
}
/* 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;
- ldap->ld_deref = deref;
+ *old_deref = ldap->ld_deref;
+ ldap->ld_deref = deref;
#endif
}
}