clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,334 Commits 494 Branches 1,367 Tags 810 MiB
b9a87a5079
Commit Graph

239 Commits

Author SHA1 Message Date
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
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
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
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Stanislav Malyshev
83039b8fee fix params parsing 2011-08-01 04:29:37 +00:00
Stanislav Malyshev
5c42cde3cb fix params parsing 2011-08-01 04:29:37 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Scott MacVicar
4dbc1a57ed Fix prototypes for ldap_control_paged_result and fix function name in tests 2011-07-14 18:49:12 +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
81eaa0c7fd Tidy up ldap paging code and rename the API as discussed in #42060 2011-05-19 17:41:21 +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
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Felipe Pena
7f9527bb22 - Fixed wrong type 2010-09-08 01:46:23 +00:00
Pierre Joye
79baca329b - #42060, add paged results support 2010-06-15 19:47:28 +00:00
Pierre Joye
6d6b037001 - #43233, sasl support for ldap on windows 2010-05-17 20:09:42 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Sriram Natarajan
20cd29d0a2 Fixed bug #50540 (Crash within ldap_first_reference function) 2009-12-21 20:39:48 +00:00
Jani Taskinen
b741b026a1 - Fixed bug #50185 (ldap_get_entries() return false instead of an empty array when there is no error). 
# This is also revert of bad patch to bug #48469 and fixes it properly.
 2009-11-18 17:44:58 +00:00
Ilia Alshanetsky
b7bb8aa545 Fixed bug #50212 (crash by ldap_get_option() with LDAP_OPT_NETWORK_TIMEOUT). 2009-11-18 13:37:45 +00:00
Ilia Alshanetsky
30b7102746 Bug #49391 ldap.c utilizing deprecated ldap_modify_s 2009-08-30 15:33:59 +00:00
Ilia Alshanetsky
e6fd4c1fc0 NULL the value after free 2009-08-18 12:44:32 +00:00
Felipe Pena
88056c6bac - Improved param. parsing for ldap_read(), ldap_search() and ldap_list() 2009-08-15 00:52:31 +00:00
Johannes Schlüter
144ff4d6b3 MFH: Fixed bug #48696 (ldap_read() segfaults with invalid parameters) (Felipe) 2009-06-25 15:19:29 +00:00
Patrick Allaert
f78a0b585c MFH: Fixing #48441 (ldap_search() with sizelimit/timelimit/deref options makes those options persistent) 2009-06-15 15:18:31 +00:00
Patrick Allaert
91a8fd7f7e MFH: Refactoring that will help fixing #48441 2009-06-15 15:04:11 +00:00
Patrick Allaert
4aca43008f MFH: Removed credit 2009-06-07 21:27:19 +00:00
Patrick Allaert
10b559c28c MFH: Fixed bug #48469 (ldap_get_entries() memory leaks on empty search results) 2009-06-07 13:07:58 +00:00
Hannes Magnusson
ac231aab45 MFH: adjust reflection info 2009-04-21 18:08:34 +00:00
Ilia Alshanetsky
4e856c44d0 Adjusted prototype 2009-04-21 12:26:19 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Hannes Magnusson
f6cf54d2b1 Fixed bug#46847 (phpinfo() is missing some settings.) 2008-12-12 13:07:28 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Felipe Pena
e304515ddb - MFH: Added parameter TSRMLS_DC in zend_is_callable() 2008-08-02 04:46:07 +00:00
Felipe Pena
644b06978a - Fix typo (thanks Pierre) 2008-07-16 13:41:35 +00:00
Antony Dovgal
dd8202f652 int->long, add missing "s" 2008-07-01 07:43:36 +00:00
Felipe Pena
7ddf985e05 - zend_arg_defs.c is unnecessary now 2008-06-30 12:15:53 +00:00