Commit graph

76 commits

Author SHA1 Message Date
David Caldwell
aef09760d1 ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap) 2017-05-30 17:30:32 +02:00
Xinchen Hui
0311dc8697 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed another part in ldap (bug #73933)
2017-01-19 12:24:04 +08:00
Xinchen Hui
5e09031144 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed another part in ldap (bug #73933)
2017-01-19 12:23:56 +08:00
Xinchen Hui
cad2598fcb Fixed another part in ldap (bug #73933) 2017-01-19 12:23:23 +08:00
Xinchen Hui
fafce65a05 Merge branch 'PHP-7.1'
* PHP-7.1:
  Update NEWS
  Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
2017-01-17 15:35:46 +08:00
Xinchen Hui
e180e45a18 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
2017-01-17 15:35:06 +08:00
Xinchen Hui
b28c2e20ca Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache) 2017-01-17 15:34:19 +08:00
Joe Watkins
00062d2ea8
Merge branch 'PHP-7.1'
* PHP-7.1:
  Adapts the readme to the new test-possibility
2017-01-07 16:46:18 +00:00
Joe Watkins
201e56cd04
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Adapts the readme to the new test-possibility
2017-01-07 16:46:01 +00:00
Andreas Heigl
fc777296bf
Adapts the readme to the new test-possibility
This commit introduces a way to use a vagrant setup to test against a
known LDAP without the need to setup an LDAP on your own machine
2017-01-07 16:45:10 +00:00
Nikita Popov
5af586bec5 Remove more PHP 6 leftovers from tests 2016-11-24 22:39:39 +01:00
Chad Sikorra
63427c1768 Make LDAP_ESCAPE_DN compliant with RFC 4514 2016-06-25 21:16:45 -05:00
Chad Sikorra
a1f2649048 Add tests for LDAP_OPT_* constants 2016-06-15 23:01:26 -05:00
Chad Sikorra
6415a86c9d Add LDAP TLS Protocol Min constants 2016-06-15 22:45:38 -05:00
Chad Sikorra
8880367773 Add tests for the LDAP CRL check option 2016-06-15 20:29:39 -05:00
Anatol Belski
86229f9943 fix SKIPIF sections 2016-03-09 14:28:38 +01:00
Edwin Hoksberg
ba96506676 LDAP - Added support to change the certificates verification 2016-03-01 04:59:30 +01:00
Côme Bernigaud
e6759644ec Revert "Added back support for undocummented host:port syntax"
This reverts commit 15876e85e5.
2015-11-24 03:45:21 +01:00
Xinchen Hui
9134f9e98f Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08:00
Côme Bernigaud
15876e85e5 Added back support for undocummented host:port syntax 2015-11-16 04:50:12 +01:00
Xinchen Hui
bb4c0c0703 Merge branch 'PHP-5.6' 2015-09-10 19:56:18 +08:00
Côme Bernigaud
059dd18c37 Added support of LDAP_OPT_TIMEOUT, fixes #69574 2015-09-09 18:02:10 +02:00
Côme Bernigaud
fb9d934d51 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 11:05:29 +02:00
Côme Bernigaud
a483a79c85 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:34:46 +02:00
Tyson Andre
c3fc65eb7c Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
LDAP_OPT_TIMELIMIT and LDAP_OPT_DEREF's original values weren't
saved properly because of a bug introduced when copy and pasting.

This lead to the original timeout being changed
when specifying a temporary override (e.g. for ldap_search(..., $timeout))
2015-09-08 18:42:02 -07:00
Côme Bernigaud
a09dcb0e13 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated README, added test to create LDAP base if missing and ease tests
2015-07-06 14:28:01 +02:00
Côme Bernigaud
42f7e4c044 Updated README, added test to create LDAP base if missing and ease tests 2015-07-06 14:26:49 +02:00
Côme Bernigaud
667e9bd417 Deprecating ldap_sort the right way 2015-06-29 14:31:20 +02:00
Andreas Heigl
6e84f8e95e Fixes ldap_sort-tests
Thanks to Côme Bernigaud for fixing!
2015-06-29 11:11:11 +02:00
Côme Bernigaud
d29cc63bb6 Fixed two errors in LDAP tests 2015-06-23 16:11:12 +02:00
Côme Bernigaud
9bcdd2aabe Fixed two errors in LDAP tests 2015-06-23 16:09:56 +02:00
Côme Bernigaud
a5629f8845 Fixed LDAP tests so that base can exists
Now you can set the base in the env var LDAP_TEST_BASE.
The base has to exists. (before tests were attempting to create/delete
the base itself)
2015-06-17 13:55:13 +02:00
Côme Bernigaud
8836404faf Fixed LDAP tests so that base can exists
Now you can set the base in the env var LDAP_TEST_BASE.
The base has to exists. (before tests were attempting to create/delete
the base itself)
2015-06-17 13:50:14 +02:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Dmitry Stogov
b5af9e8599 More accurate mysql_close() 2014-05-20 13:19:21 +04:00
Xinchen Hui
e1317ed517 Refactored ext/ldap 2014-05-20 11:26:26 +08:00
Stanislav Malyshev
ea0769f00e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Implement ldap_modify_batch.
2014-01-25 22:04:39 -08:00
Ondřej Hošek
c0e3429904 Implement ldap_modify_batch. 2014-01-22 18:54:11 +01:00
Michael Wallner
f711c1219d Merge branch 'ldap_escape-dev' of https://github.com/DaveRandom/php-src
* 'ldap_escape-dev' of https://github.com/DaveRandom/php-src:
  Add ldap_escape()
2013-10-18 11:17:41 +02:00
Michael Wallner
2b78edfba2 fix test 2013-09-30 11:41:35 +02:00
Chris Wright
0d534d7c5e Add ldap_escape() 2013-09-18 12:18:05 +01:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Anatoliy Belsky
5d1565088f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails
2012-04-16 15:26:50 +02:00
Anatoliy Belsky
1c435ae498 Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails 2012-04-16 15:25:20 +02:00
Anatoliy Belsky
1a44faf264 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails
2012-04-16 15:21:04 +02:00
Anatoliy Belsky
47e7755785 Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails 2012-04-16 15:20:03 +02:00
Scott MacVicar
3d5385dda5 Fix typo in tests for ldap bug #42060 2011-08-24 06:50:39 +00:00
Scott MacVicar
1bc1d3572f Fix prototypes for ldap_control_paged_result and fix function name in tests 2011-07-14 18:49:12 +00:00
Scott MacVicar
3cb4de03dc Tidy up ldap paging code and rename the API as discussed in #42060 2011-05-19 17:41:21 +00:00