Commit graph

130430 commits

Author SHA1 Message Date
Ben Ramsey
c9ce25c800
Merge branch 'PHP-8.1' into PHP-8.2 2023-02-14 14:13:30 -06:00
Ben Ramsey
d9ac59b0a9
Ensure tar is not bsdtar 2023-02-14 14:13:01 -06:00
Ben Ramsey
1d2e6cb016
Merge branch 'PHP-8.1' into PHP-8.2 2023-02-14 13:49:49 -06:00
Ben Ramsey
843ba82b53
Use gtar if it's in the PATH 2023-02-14 13:49:02 -06:00
Ben Ramsey
586e81b259
Point to the issue tracker on GitHub 2023-02-14 13:49:02 -06:00
Tim Düsterhus
a313cce913
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [ci skip] NEWS (#10586)
  [ci skip] Next release will be 8.0.29
2023-02-14 20:28:27 +01:00
Tim Düsterhus
5e69d76bbc
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  [ci skip] Next release will be 8.0.29
2023-02-14 20:27:53 +01:00
Niels Dossche
e35e6dc351
[ci skip] NEWS (#10586) 2023-02-14 20:27:29 +01:00
Pierrick Charron
dc054488da
PHP-8.2 is now for PHP 8.2.4-dev 2023-02-14 10:02:46 -05:00
Gabriel Caruso
0e45ed772d
[ci skip] Next release will be 8.0.29 2023-02-14 15:19:11 +01:00
Remi Collet
73b3f78ea0
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  more config for new FPM tests
2023-02-14 14:14:34 +01:00
Remi Collet
b11d855dbf
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  more config for new FPM tests
2023-02-14 14:14:03 +01:00
Remi Collet
e86d8704b4
more config for new FPM tests 2023-02-14 14:13:40 +01:00
Jakub Zelenka
cbf089018b
Merge branch 'PHP-8.1' into PHP-8.2 2023-02-14 11:00:20 +00:00
Jakub Zelenka
4058d20608
Merge branch 'PHP-8.0' into PHP-8.1 2023-02-14 10:52:17 +00:00
Jakub Zelenka
937b1e38e2
Fix missing colon in NEWS 2023-02-14 10:46:48 +00:00
Jakub Zelenka
eef29d434a
Change NEWS for GHSA-54hq-v5wp-fqgv as it is for all SAPIs 2023-02-14 10:42:40 +00:00
Jakub Zelenka
caaaf75990
Fix incorrect character in NEWS 2023-02-14 10:33:56 +00:00
Jakub Zelenka
054c7b09f9 Update NEWS 2023-02-14 10:23:59 +00:00
Jakub Zelenka
716de0cff5
Introduce max_multipart_body_parts INI
This fixes GHSA-54hq-v5wp-fqgv DOS vulnerabality by limitting number of
parsed multipart body parts as currently all parts were always parsed.
2023-02-14 10:21:23 +00:00
Jakub Zelenka
e45850c195
Fix repeated warning for file uploads limit exceeding 2023-02-14 10:21:07 +00:00
Dmitry Stogov
e3aa73904a Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix updating SSA object type for *_ASSIGN_OP (#10458)
2023-02-14 11:29:47 +03:00
Niels Dossche
d94ddbed2c
Fix updating SSA object type for *_ASSIGN_OP (#10458)
The code fetched the class entry into ce for objects and static
properties. However, when the actual update needs to take place (when
result_def exists), the class entry in ce was reset to NULL. So the SSA
object type update never happened. Fetch the class entry in the
result_def>=0 case instead after the reset of ce to NULL.
2023-02-14 11:29:29 +03:00
Dmitry Stogov
cec528d06b Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix assertion failure when var_dump'ing void FFI result (#10568)
2023-02-13 22:38:43 +03:00
Niels Dossche
1a5fc6e1a3
Fix assertion failure when var_dump'ing void FFI result (#10568) 2023-02-13 22:38:28 +03:00
Ben Ramsey
32f0ee3b8c
Merge branch 'PHP-8.1' into PHP-8.2 2023-02-13 13:22:59 -06:00
Ben Ramsey
28d68f5013
PHP-8.1 is now for PHP 8.1.17-dev 2023-02-13 13:16:07 -06:00
Bob Weinand
98b8d1c152 Merge branch 'PHP-8.1' into PHP-8.2 2023-02-13 16:34:19 +00:00
Bob Weinand
95016138a5 Fix GH-10496: Fibers must not be garbage collected while implicitly suspended by resumption of another fiber 2023-02-13 16:30:21 +00:00
Bob Weinand
0e31e03bc5 Merge branch 'PHP-8.1' into PHP-8.2 2023-02-13 13:10:08 +01:00
Arnaud Le Blanc
d721dcc2ef Fix colletion of unfinished function call in fibers
Fixes GH-10496.

Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
2023-02-13 13:09:04 +01:00
Stanislav Malyshev
e8c64b62da Merge branch 'PHP-8.1' into PHP-8.2 2023-02-12 21:34:10 -07:00
Stanislav Malyshev
85d9278db2 Merge branch 'PHP-8.0' into PHP-8.1 2023-02-12 21:33:39 -07:00
Stanislav Malyshev
b5ccaaf613 Update NEWS 2023-02-12 21:04:31 -07:00
Niels Dossche
ec10b28d64 Fix array overrun when appending slash to paths
Fix it by extending the array sizes by one character. As the input is
limited to the maximum path length, there will always be place to append
the slash. As the php_check_specific_open_basedir() simply uses the
strings to compare against each other, no new failures related to too
long paths are introduced.
We'll let the DOM and XML case handle a potentially too long path in the
library code.
2023-02-12 20:56:19 -07:00
Stanislav Malyshev
af2ddc6426 Update NEWS 2023-02-12 20:53:06 -07:00
Tim Düsterhus
a92acbad87 crypt: Fix possible buffer overread in php_crypt() 2023-02-12 20:46:51 -07:00
Tim Düsterhus
c840f71524 crypt: Fix validation of malformed BCrypt hashes
PHP’s implementation of crypt_blowfish differs from the upstream Openwall
version by adding a “PHP Hack”, which allows one to cut short the BCrypt salt
by including a `$` character within the characters that represent the salt.

Hashes that are affected by the “PHP Hack” may erroneously validate any
password as valid when used with `password_verify` and when comparing the
return value of `crypt()` against the input.

The PHP Hack exists since the first version of PHP’s own crypt_blowfish
implementation that was added in 1e820eca02.

No clear reason is given for the PHP Hack’s existence. This commit removes it,
because BCrypt hashes containing a `$` character in their salt are not valid
BCrypt hashes.
2023-02-12 20:46:44 -07:00
Arnaud Le Blanc
4d0ce3a7e5 [ci skip] NEWS 2023-02-11 16:28:51 +01:00
Niels Dossche
e787d6c9e6
Fix GH-10548: copy() fails on cifs mounts because of incorrect length (cfr_max) specified in streams.c:1584 copy_file_range() (#10551)
On some filesystems, the copy operation fails if we specify a size
larger than the file size in certain circumstances and configurations.
In those cases EIO will be returned as errno and we will therefore fall
back to other methods.
2023-02-11 16:25:14 +01:00
Ilija Tovilo
0d56a5b591
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Temporarily disable odbc in ci
2023-02-11 13:35:35 +01:00
Ilija Tovilo
18b611d6a0
Temporarily disable odbc in ci
The unixodbc.h header is suddenly missing.
2023-02-11 13:22:27 +01:00
Ilija Tovilo
b9d1eca8fd
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Mark test as XFAIL
2023-02-11 00:21:59 +01:00
Ilija Tovilo
13c34aac05
Mark test as XFAIL
See https://github.com/php/php-src/pull/10546
2023-02-11 00:21:01 +01:00
Niels Dossche
3af33a3e20
[ci skip] NEWS (#10561) 2023-02-10 23:18:50 +00:00
Derick Rethans
b463bc4349 Merge remote-tracking branch 'derickr/precision-equivalence' into PHP-8.2 2023-02-10 14:45:26 +00:00
Derick Rethans
ada261557b Merge remote-tracking branch 'derickr/ossfuzz-unserialise-fixes' into PHP-8.2 2023-02-10 14:45:07 +00:00
George Peter Banyard
d8cec14c11
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix memory leaks in ext-tidy
2023-02-10 14:16:38 +00:00
George Peter Banyard
704aadd098
Fix memory leaks in ext-tidy
We must not instantiate the object prior checking error conditions
Moreover, we need to release the HUGE amount of memory for files which are over 4GB when throwing a ValueError

Closes GH-10545
2023-02-10 14:12:23 +00:00
Derick Rethans
5d9ee8f920 Fixed OSS fuzz issues #55589, #55599, and #55727 2023-02-10 13:03:47 +00:00