1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Commit Graph

483 Commits

Author SHA1 Message Date
Máté Kocsis e950ca13ea Consolidate the usage of "either" and "one of" in error messages
Closes GH-6173
2020-09-20 19:41:47 +02:00
Máté Kocsis c98d47696f Consolidate new union type ZPP macro names
They will now follow the canonical order of types. Older macros are
left intact due to maintaining BC.

Closes GH-6112
2020-09-11 11:00:18 +02:00
Máté Kocsis 36cdbd0549 Promote warnings to exceptions in ext/ldap
Closes GH-6065
2020-09-04 15:26:16 +02:00
Máté Kocsis 8107a1da5a Use ZPP instead of custom type checks
We can add these types as a native type declaration to stubs as a side-effect. Closes GH-6068
2020-09-04 14:32:34 +02:00
George Peter Banyard 96c7d42a3c Use ZPP callable check for ldap_set_rebind_proc() 2020-08-13 21:14:51 +02:00
Máté Kocsis 156c1806db Convert the $ttl parameter of ldap_exop_refresh() to int 2020-08-03 00:38:59 +02:00
Côme Chilliet 08dcb8e604 Merge branch 'PHP-7.4'
* PHP-7.4:
  Updated NEWS
  fix memory leaks in ext/ldap/ldap.c
  fix memory leaks in ext/ldap/ldap.c
2020-07-28 10:29:59 +02:00
Paweł Tomulik fef5a9e502 fix memory leaks in ext/ldap/ldap.c 2020-07-28 10:27:22 +02:00
Máté Kocsis d30cd7d7e7 Review the usage of apostrophes in error messages
Closes GH-5590
2020-07-10 21:05:28 +02:00
Nikita Popov bee2cf0899 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix some memory bugs in ldap.c
2020-07-10 09:50:12 +02:00
Nikita Popov 22352868ec Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix some memory bugs in ldap.c
2020-07-10 09:49:50 +02:00
Paweł Tomulik 23ef0a1285 Fix some memory bugs in ldap.c 2020-07-09 18:35:00 +02:00
Max Semenik 2b5de6f839 Remove proto comments from C files
Closes GH-5758
2020-07-06 21:13:34 +02:00
Nikita Popov 0280b83e11 Avoid some unnecessary uses of no_separation=0
For the rare cases where references are part of the API,
construct them explicitly. Otherwise do not allow separation.
2020-07-06 19:05:57 +02:00
Paweł Tomulik 915abeb699 Add ldap_count_references()
Closes GH-5784
2020-07-01 09:29:46 +02:00
Paweł Tomulik b3698ed9eb Promote warning to exception in ldap_set_rebind_proc()
From now on, ldap_set_rebind_proc() will only accept callable or null
as argument 2.

Closes GH-5763
2020-06-30 16:08:34 +02:00
Christoph M. Becker 07ff243f07 Fix macro redifinition warnings in debug builds
MSVC considers these warnings[1] to be severe (level 1), so we better
fix the respective code.

[1] <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4005?view=vs-2019>
2020-06-29 19:11:22 +02:00
George Peter Banyard 046ff29958 Fix [-Wundef] warnings in LDAP extension 2020-05-18 00:37:15 +02:00
Máté Kocsis 610815c0ce Improve gen_stub.php
Closes GH-5350
Add support for generating deprecated function entries, as well as forward declaration
of function aliases.
2020-04-04 23:52:33 +02:00
George Peter Banyard c3e65d9069 Fix [-Wtype-limits] warning in LDAP by removing unnecessary condition
As context is a pointer to a berval struct and bv_len is of type
ber_len_t [1] which it self is defined as an unsigned integer [2]
this condition is always true.

[1] https://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=blob;f=include/lber.h#l212
[2] https://www.openldap.org/software//man.cgi?query=ber_free&sektion=3&apropos=0&manpath=OpenLDAP+2.4-Release
2020-02-06 13:20:15 +01:00
Máté Kocsis d1764ca330 Make error messages more consistent by fixing capitalization
Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.
2020-01-17 14:52:46 +01:00
Máté Kocsis 1abea33b1e Fix usage of RETURN_THROWS() in LDAP extension 2020-01-03 22:40:16 +01:00
Máté Kocsis aadd3aaed9 Use RETURN_THROWS() in various places 2020-01-03 21:10:24 +01:00
Máté Kocsis bbcfa66e06 Use RETURN_THROWS() after zend_fetch_resource*() 2020-01-03 19:20:56 +01:00
Christoph M. Becker d694edaee4 Fix erroneous change 2019-12-31 12:24:01 +01:00
Máté Kocsis 345703724c Use RETURN_THROWS() during ZPP in most of the extensions
Except for some bigger ones: reflection, sodium, spl
2019-12-31 11:46:11 +01:00
Máté Kocsis 9493893412 Cleanup return values when parameter parsing is unsuccessful 2019-10-30 16:05:20 +01:00
Stephen Reay 72e3b252e8 Adding ldap stubs for arginfo 2019-09-25 15:09:25 +02:00
Gabriel Caruso 5d6e923d46 Remove mention of PHP major version in Copyright headers
Closes GH-4732.
2019-09-25 14:51:43 +02:00
Nikita Popov 2789ad982e Merge branch 'PHP-7.4' 2019-09-06 14:48:31 +02:00
Nikita Popov 025ff3b5a3 Remove nsldap support
The newest version we're checking (libssldap50) seems to be about
15 years out of date. We could add support for libssldap60 (also
unmainted, but more recent), but given how nobody has expressed any
interest in this, I'm going ahead and dropping this code.
2019-09-06 14:39:42 +02:00
Nikita Popov 0d8a399afa Merge branch 'PHP-7.4' 2019-08-29 19:07:59 +02:00
Nikita Popov 48ff226cae Fix potentially uninitialized use in ldap
If ctrl->ldctl_value.bv_len is zero context is uninitialized. Only
free it if the call took place and succeeded.
2019-08-29 19:07:45 +02:00
Christoph M. Becker 6cd821b2d1 Merge branch 'PHP-7.4'
* PHP-7.4:
  Don't modify arrays passed by value
2019-08-25 18:29:08 +02:00
Christoph M. Becker ac40d0ffbc Don't modify arrays passed by value 2019-08-25 18:27:35 +02:00
Nikita Popov 85b17a0429 Remove some unnecessary RETURN_FALSE 2019-08-20 17:08:19 +02:00
Christoph M. Becker 9c0c20b9f8 Merge branch 'PHP-7.4'
* PHP-7.4:
  Don't use C++ style comments
2019-08-20 13:59:20 +02:00
Christoph M. Becker ae923287ca Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Don't use C++ style comments
2019-08-20 13:58:54 +02:00
Christoph M. Becker 963b40c9a8 Don't use C++ style comments
Cf. <https://github.com/php/php-src/blob/f45b61b8988b5b2d80dd4a1df7edd04282cf319a/CODING_STANDARDS.md#syntax-and-indentation>

cc @mcmic
2019-08-20 13:58:22 +02:00
Nikita Popov ac749b126f Merge branch 'PHP-7.4' 2019-06-26 11:43:30 +02:00
Nikita Popov 80958d0f90 Use ldap_destroy instead of ldap_unbind_ext 2019-06-26 11:43:11 +02:00
Nikita Popov ca2a6f75bf Merge branch 'PHP-7.4' 2019-06-14 11:14:08 +02:00
Nikita Popov ec77cca5f3 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-14 11:13:43 +02:00
Nikita Popov 98457b6d60 Fix some leaks in ldap
The result of zval_get_string() needs to be released. In some places
where it is inconvenient to manage, I went back to convert_to_string.
It is safe in those places due to existing array separations.

Also fix a preexisting leak when getting controls, the previous
value was not destroyed.
2019-06-14 11:11:24 +02:00
Côme Chilliet 890e846d85 Merge branch 'PHP-7.4'
* PHP-7.4:
  Some more string conversion handling, fixing bug #77958
  Avoid converting zval when not needed
2019-06-13 22:15:41 +02:00
Côme Chilliet 9684d5f282 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Some more string conversion handling, fixing bug #77958
  Avoid converting zval when not needed
2019-06-13 22:15:13 +02:00
Côme Chilliet 5d2fe48785 Some more string conversion handling, fixing bug #77958 2019-06-13 22:12:34 +02:00
Côme Chilliet c219d8d5c2 Avoid converting zval when not needed
Also added exception checks so that exception from __toString are
 correctly handled in the future
2019-06-13 20:58:45 +02:00
Nikita Popov 466666c616 Merge branch 'PHP-7.4' 2019-06-11 17:12:33 +02:00
Hugh McMaster 9d61036651 ext/ldap: Use PKG_CHECK_MODULES to detect the libsasl2 library 2019-06-11 17:11:53 +02:00