Côme Bernigaud
059dd18c37
Added support of LDAP_OPT_TIMEOUT, fixes #69574
2015-09-09 18:02:10 +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
40befb943c
Patch from Rainer Jung to provide Solaris LDAP support
2015-08-18 16:52:44 +02:00
Anatol Belski
91f985b2f9
fix config.w32
2015-07-23 07:39:25 +02:00
Anatol Belski
3d38db3576
fix C99 compat
2015-07-23 07:39:16 +02:00
Côme Bernigaud
022068342b
Attempt at falling back on ldap_find_control for Mac OS
2015-07-06 14:54:04 +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
Anatol Belski
57525d01dc
keep LDAP_DEPRECATED in config.w32
2015-06-30 09:30:48 +02:00
Côme Bernigaud
2e85e6d3ee
Merge PR about LDAP cleaning by removing deprecated calls
...
Merge branch 'pull-request/1357' into PHP-5.6
* pull-request/1357:
Putting back deprecated symbols for ldap_sort
Removed deprecated function calls from ldap module
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-29 09:31:37 +02:00
Côme Bernigaud
736d840c8b
Putting back deprecated symbols for ldap_sort
2015-06-29 09:07:49 +02:00
Côme Bernigaud
5250fc772d
Removed deprecated function calls from ldap module
...
ldap_search -> ldap search_ext
ldap_search_s ->_ldap_search_ext_s
ldap_add_s -> ldap_add_ext_s
ldap_delete_s -> ldap_delete_ext_s
ldap_compare_s -> ldap_compare_ext_s
ldap_value_free -> ldap_memvfree
Only thing left is ldap_sort_entries, no replacement
2015-06-23 16:44:48 +02:00
Côme Bernigaud
9bcdd2aabe
Fixed two errors in LDAP tests
2015-06-23 16:09:56 +02:00
Côme Bernigaud
ea49be9b37
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-23 15:50:14 +02:00
Andreas Heigl
eb702637a9
Implements extended error messages
...
This commit introduces a new constant that can be used to retrieve more
detailed error messages.
This fixes #47222
The new constant LDAP_OPT_DIAGNOSTIC_MESSAGE is defined in PHP when the
underlying library provides (and understands) it. This is the case in
the current OpenLDAP-implementation.
Tanks to Johnny Willer who provided the solution at 28816473 (28816473)
2015-06-17 15:39:07 +02:00
Côme Bernigaud
e7af0fe1eb
Replaced calls to deprecated openldap functions
...
ldap_unbind_s -> ldap_unbind_ext
389 -> LDAP_PORT
ldap_init -> ldap_initialize
ldap_bind_s -> ldap_sasl_bind_s
ldap_value_free -> ber_memvfree
Also added ldap_is_ldap_url check
2015-06-17 14:36:38 +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
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Stanislav Malyshev
a8e84b1b21
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Set an LDAP error code when failing ldap_bind due to null bytes
2014-09-28 12:25:49 -07:00
Stanislav Malyshev
ef39f40445
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Set an LDAP error code when failing ldap_bind due to null bytes
2014-09-28 12:25:24 -07:00
Matthew Daley
fcbe20d357
Set an LDAP error code when failing ldap_bind due to null bytes
...
Some applications check a LDAP link's error code after seeing ldap_bind
fail due to a null byte bind attempt and hence incorrectly receive the
last set error code.
Fix by setting an LDAP error code before returning in this case.
2014-09-28 12:23:52 -07:00
Stanislav Malyshev
59900dd37f
Fix null byte in LDAP bindings
2014-04-14 10:51:32 -07:00
Stanislav Malyshev
ed4de188dd
Fix null byte in LDAP bindings
2014-04-14 10:46:46 -07:00
Stanislav Malyshev
ad1b9eef98
Fix null byte in LDAP bindings
2014-04-14 10:44:53 -07: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
Stanislav Malyshev
6fca805b3b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Implement ldap_modify_batch.
Conflicts:
ext/ldap/ldap.c
2014-01-25 22:04:28 -08:00
Ondřej Hošek
c0e3429904
Implement ldap_modify_batch.
2014-01-22 18:54:11 +01:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Michael Wallner
a03b1328b8
fix compiler warnings and type usage
2013-10-18 11:34:24 +02: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
Christopher Jones
5bc377457e
Allow the ldap extension to be compiled with Oracle's LDAP
...
implementation, if desired. Note the implementations differ so you
will see different ldap behavior.
The patch allows configuration similar to:
--with-ldap=$HOME/instantclient --with-oci8=instantclient,$HOME/instantclient
The patch doesn't support configuration similar to:
--with-ldap --with-oci8=instantclient,$HOME/instantclient
since this would try and mix the default LDAP and Oracle LDAP
implementations.
This patch closes out bug #61450 and the associated github PR.
Regardless of this patch, my recommended way to install both OCI8 and
ldap extensions is to statically configure PHP with ldap, and then add
OCI8 as a shared extension from PECL.
2013-10-04 15:50:16 -07:00
Michael Wallner
d4d6a95105
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
fix memleak on resetting rebind_proc
2013-09-30 14:04:48 +02:00
Michael Wallner
2b78edfba2
fix test
2013-09-30 11:41:35 +02:00
Michael Wallner
e9e63f9223
fix memleak on resetting rebind_proc
2013-09-30 11:23:33 +02:00
Chris Wright
0d534d7c5e
Add ldap_escape()
2013-09-18 12:18:05 +01:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08: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
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Scott MacVicar
3d5385dda5
Fix typo in tests for ldap bug #42060
2011-08-24 06:50:39 +00:00
