php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
105,646 Commits 547 Branches 1,483 Tags
fed09a23b7af9024ebb4e7c8fb592752425bdc7a
Commit Graph

95 Commits

Author SHA1 Message Date
Stanislav Malyshev
4c06d929c0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 22:03:33 -07:00
Stanislav Malyshev
95ee9efa57 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 22:00:24 -07:00
Stanislav Malyshev
5a18d7a0df Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 21:59:57 -07:00
Stanislav Malyshev
49782c5499 Fix bug #76248 - Malicious LDAP-Server Response causes Crash 2018-04-22 22:01:35 -07:00
Côme Chilliet
e67379399a Removing client controls attribute from ldap_exop signature 
Client controls will not get implemented in php-ldap as
 they are specific to each client ldap lib and most of the
 time unused any way. (servers controls on the other end are used
 and will get implemented)
 2017-09-07 16:31:03 +02:00
Côme Chilliet
aa0e402acf Added controls parameters to ldap_exop so that control support can be added later 2017-08-04 18:10:49 +02:00
Côme Chilliet
a148ee8c7c Fixed removing all controls by passing an empty array to ldap_set_option 2017-07-11 16:18:33 +02:00
Côme Chilliet
274d84139b Added constants for known ldap controls OID and tests for ldap_get/set_option for controls 
Also fixed existing tests which were expecting ldap_get_option to fail on controls
 2017-07-05 16:41:52 +02:00
Côme Chilliet
209c9ba384 Test ldap_exop_passwd with less parameters to be sure it works 2017-07-04 10:17:41 +02:00
Côme Chilliet
3207747b9e Changed API to avoid using passing result by reference 
See discussion on internals ML
 2017-07-04 10:03:27 +02:00
Côme Chilliet
bda80aa332 Swapped position of retoid and retdata as retoid is almost never used 2017-07-03 10:58:13 +02:00
Côme Chilliet
e9001cab46 Removed two step syntax for EXOP helpers, one call workflow is enough 2017-07-03 10:58:13 +02:00
Côme Chilliet
5020325a6f Improved ldap_exop test to encode&decode a passwd EXOP to test sending/recieving data 2017-07-03 10:58:13 +02:00
Côme Chilliet
9aa99cc34c Added constants for standard EXOPs 2017-07-03 10:58:13 +02:00
Côme Chilliet
e832ce4b22 Fixed ldap_exop and ldap_parse_exop. Only tested them for whoami exop. (see test file) 2017-07-03 10:58:13 +02:00
Côme Chilliet
28530b2f1c Fixed ldap_parse_exop_whoami and ldap_parse_exop_passwd and added test for them 2017-07-03 10:58:13 +02:00
Côme Chilliet
ae76c8ba2c Fixed ldap_exop_passwd and added tests for it 2017-07-03 10:58:12 +02:00
David Caldwell
aef09760d1 ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap) 2017-05-30 17:30:32 +02:00
Côme Bernigaud
1bb295e659 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
  ext/ldap: Allow default host from ldap.conf to work.

Conflicts:
	ext/ldap/ldap.c
 2017-05-30 16:48:16 +02:00
David Caldwell
49d1cdc393 ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap) 2017-05-25 21:27:11 +00: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