Anatol Belski
ca4eeedd36
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix leak
2016-08-29 18:05:47 +02:00
Anatol Belski
e2609a38d9
fix leak
2016-08-29 18:01:21 +02: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
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Xinchen Hui
87958927b0
Fixed bug #71249 (ldap_mod_replace/ldap_mod_add store value as string "Array")
2016-01-01 07:06:58 -08: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
Côme Bernigaud
5a8bcf73ba
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
...
This reverts commit 391087ed28
2015-11-24 03:45:17 +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
fc611a134b
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-12 14:20:03 +08:00
Côme Bernigaud
391087ed28
Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
...
Note that passing 0 will also result in default port.
2015-11-12 07:06:05 +01:00
Dmitry Stogov
560e4fa393
Removed or simplified incorrect SEPARATE_*() macros usage.
2015-09-29 11:17:43 +03:00
Dmitry Stogov
719664dec2
fixed compilation error
2015-09-10 20:24:11 +03: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
8acda9cad5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Patch from Rainer Jung to provide Solaris LDAP support
Conflicts:
ext/ldap/ldap.c
2015-08-18 17:26:46 +02: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
Anatol Belski
73c0fc0df4
move the define to the right place
...
thanks Kalle )
2015-07-06 19:43:35 +02:00
Côme Bernigaud
da6e286dbb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Attempt at falling back on ldap_find_control for Mac OS
2015-07-06 14:56:20 +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
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
Dmitry Stogov
7a1a499377
Fixed return value
2015-07-06 11:25:19 +03:00
Dmitry Stogov
34ec1c96e7
Cleanup (avoid reallocation).
2015-07-01 13:49:57 +03:00
Dmitry Stogov
7aa7627172
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 13:59:27 +03:00
Côme Bernigaud
d554d64f64
Merge branch 'PHP-5.6'
...
* PHP-5.6:
keep LDAP_DEPRECATED in config.w32
2015-06-30 09:31:19 +02:00
Anatol Belski
57525d01dc
keep LDAP_DEPRECATED in config.w32
2015-06-30 09:30:48 +02:00
Dmitry Stogov
6cf6f2c6bf
Merge branch 'PHP-5.6'
...
* PHP-5.6:
On Windows PHP may be restarted with different set of DSO extensions without SHM reset. This may make optimisation for entities from DSO extensions inconsistent.
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 18:14:14 +03: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
Andreas Heigl
85aabd3e85
Adds deprecation-message for ldap_sort
2015-06-29 11:11:11 +02:00
Anatol Belski
07c971b665
keep LDAP_DEPRECATED in config.w32
2015-06-29 10:12:36 +02:00
Côme Bernigaud
d4077410b8
Putting back deprecated symbols for ldap_sort
2015-06-29 09:42:47 +02:00
Côme Bernigaud
0483b6e868
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
Conflicts:
ext/ldap/ldap.c
2015-06-29 09:42:47 +02:00
Côme Bernigaud
4f7808ec50
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
...
Conflicts:
ext/ldap/ldap.c
2015-06-29 09:42:47 +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
Rasmus Lerdorf
41774bceff
Fix more minor mistakes in the proto comments
2015-06-23 15:47:33 -04: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
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
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 http://stackoverflow.com/questions/28765077/get-number-of-ad-errors-with-ldap-and-php-ldap-function-return-unprecise-error/28816473#28816473
2015-06-17 15:39:07 +02:00
