1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Commit Graph

332 Commits

Author SHA1 Message Date
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +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
Stanislav Malyshev 83039b8fee fix params parsing 2011-08-01 04:29:37 +00:00
Felipe Pena 23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena 4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +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
Raphael Geissert a286fa3523 Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339
Patch by Clint Byrum
2011-03-18 18:47:09 +00:00
Raphael Geissert 5b55a18622 Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339
Patch by Clint Byrum
2011-03-18 18:47:09 +00:00
Felipe Pena 927bf09c29 - Year++ 2011-01-01 02:19:59 +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 ed4f6dbd36 - make libsasl optional (as vc6 bins do not have it) 2010-07-26 22:28:38 +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
Pierre Joye 57cfa703bf - #43233, sasl support for ldap on windows 2010-05-17 20:09:42 +00:00
Rob Richards 0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen 518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +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 d55669c6ab - Update tests to reflect current behavior after fix for bug #50185 2009-12-24 02:08:23 +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
Felipe Pena b6a1b37889 - Fixed tests 2009-09-26 17:59:33 +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
Antony Dovgal 2fffc2b06c fix test 2009-07-26 19:45:38 +00:00
Patrick Allaert 17aa260703 MFH: Tests for ext/ldap from PHPBelgium TestFest 2009-07-03 09:21: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