Christoph M. Becker
22eddb3f6a
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Haiku fix ZTS build disabling `tsrm_ls_cache` usage.
2022-04-26 14:18:43 +02:00
Christoph M. Becker
4c0639df1c
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Haiku fix ZTS build disabling `tsrm_ls_cache` usage.
2022-04-26 14:18:02 +02:00
David Carlier
4bb0dd49d8
Haiku fix ZTS build disabling tsrm_ls_cache usage.
2022-04-26 14:16:38 +02:00
Christoph M. Becker
7ce5e0a8f1
[ci skip] Merge branch 'PHP-8.1'
...
* PHP-8.1:
Prepare for PHP 8.0.20
2022-04-26 10:50:31 +02:00
Christoph M. Becker
990a8cd09c
[ci skip] Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Prepare for PHP 8.0.20
2022-04-26 10:48:17 +02:00
Gabriel Caruso
52a18a6620
Prepare for PHP 8.0.20
2022-04-26 10:17:50 +02:00
Dmitry Stogov
45d7695b5d
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fixed tests
2022-04-26 08:32:50 +03:00
Dmitry Stogov
e9d65c8e2b
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fixed tests
2022-04-26 08:32:28 +03:00
Dmitry Stogov
3564eaff42
Fixed tests
2022-04-26 08:31:42 +03:00
Christoph M. Becker
f107f968ec
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix GH-8218: ob_end_clean does not reset Content-Encoding header
2022-04-25 14:30:26 +02:00
Christoph M. Becker
e063243d2e
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-8218: ob_end_clean does not reset Content-Encoding header
2022-04-25 14:29:44 +02:00
Christoph M. Becker
30f4c725cb
Fix GH-8218: ob_end_clean does not reset Content-Encoding header
...
The fix for GH-7953 introduced a regression by being to deliberate
adding the respective headers. These must only be added, if the
handler starts, but is not finalizing.
Closes GH-8353.
2022-04-25 14:26:56 +02:00
Dmitry Stogov
27efd125ed
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix ISSET_ISEMPTY_VAR missoptimization
2022-04-25 13:31:40 +03:00
Dmitry Stogov
948ef10dd0
Fix ISSET_ISEMPTY_VAR missoptimization
...
This fixes oss-fuzz #46909
2022-04-25 13:31:01 +03:00
Dmitry Stogov
73514d6e4f
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Reorder optimization passes to avoid miss-optimization
2022-04-25 13:12:03 +03:00
Dmitry Stogov
1aa5e9392d
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Reorder optimization passes to avoid miss-optimization
2022-04-25 13:09:31 +03:00
Dmitry Stogov
3b735456c6
Reorder optimization passes to avoid miss-optimization
2022-04-25 13:09:05 +03:00
Dmitry Stogov
992c8061b4
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix type inference
2022-04-25 12:17:17 +03:00
Dmitry Stogov
e14dc15e13
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix type inference
2022-04-25 12:17:07 +03:00
Dmitry Stogov
3e78964742
Fix type inference
...
Use MAY_BE_NULL result (insted of empty) for ASSIGN_DIM with invalid arguments
This fixes oss-fuzz #46840
2022-04-25 12:15:55 +03:00
Dmitry Stogov
9e6eb9d5a5
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix type narrowing warning during type inference of ZEND_FETCH_DIM_W
2022-04-25 11:18:37 +03:00
Dmitry Stogov
2cff0e674d
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix type narrowing warning during type inference of ZEND_FETCH_DIM_W
2022-04-25 11:17:04 +03:00
Dmitry Stogov
8286de2fd3
Fix type narrowing warning during type inference of ZEND_FETCH_DIM_W
...
Fixes oss-fuzz #45820
2022-04-25 11:16:10 +03:00
Ilija Tovilo
619f40f14c
Fix leak introduced by GH-8241 ( #8403 )
...
Temporarily store result of ini builder in ini_entries to avoid a leak
when main() exists prematurely. Technically ini_entries isn't released
either but ASAN doesn't consider unreleased memory referenced from
globals leaks.
2022-04-25 09:31:51 +02:00
Nikita Popov
460bbc8ebe
Add clarifying comment for SEND_VAL usage
...
This confused me for a bit, because we're using SEND_VAL here to
potentially perform a by-ref SEND, while it is usually used for
by-val SENDs.
2022-04-24 18:21:32 +02:00
Bob Weinand
7f34afc32b
Merge branch 'PHP-8.1'
2022-04-24 18:05:08 +02:00
Bob Weinand
ff6b813557
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-24 18:04:37 +02:00
Bob Weinand
a74b865123
Add missing SKIPIF for new ext/ffi test
2022-04-24 18:02:46 +02:00
Nikita Popov
1254aa4f3e
Avoid setting ce for ref return_info
...
This is unlikely to matter in practice (due to short lifetime),
but necessary to satisfy the SSA integrity check.
Fixes oss-fuzz #46980 .
2022-04-24 17:35:51 +02:00
Bob Weinand
ab1d5a9d2a
Merge branch 'PHP-8.1'
2022-04-24 14:55:01 +02:00
Bob Weinand
01b91cb3b1
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-24 14:53:51 +02:00
Bob Weinand
2397e7685e
Fix GH-8433: Assigning function pointers to structs in FFI leaks memory
2022-04-24 14:53:18 +02:00
Christoph M. Becker
19273ffe74
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix GH-8364: msgfmt_format $values may not support references
2022-04-24 12:46:07 +02:00
Christoph M. Becker
1c0dc2a6c9
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix GH-8364: msgfmt_format $values may not support references
2022-04-24 12:45:22 +02:00
Christoph M. Becker
f5d9e7c031
Fix GH-8364: msgfmt_format $values may not support references
...
We need to deref any references passed in the `$values` array. While
we could handle this in the type switch, doing it right away in the
foreach loop makes that more explicit, and also circumvents the missing
range checks for integers which are not passed as int or double.
Closes GH-8407.
2022-04-24 12:43:08 +02:00
Jakub Zelenka
53285891fb
Merge branch 'PHP-8.1'
2022-04-23 15:19:04 +01:00
Jakub Zelenka
8da14a3062
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-23 15:16:00 +01:00
David Carlier
ff90d42b8b
Fix FPM kqueue handler fix remove callback typo
...
It avoids confusion on failed event.
2022-04-23 15:11:53 +01:00
George Peter Banyard
cf51d8ffe7
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix GH-8273: SplFileObject: key() returns wrong value
2022-04-23 14:02:01 +01:00
George Peter Banyard
660ef91fbc
Fix GH-8273: SplFileObject: key() returns wrong value
2022-04-23 14:00:11 +01:00
George Peter Banyard
6186ecd436
Fix GH-8273: SplFileObject: key() returns wrong value
2022-04-23 13:56:38 +01:00
Max Kellermann
fa6d97db5d
main/streams/streams: use copy_file_range() on Linux ( #8413 )
...
copy_file_range() is a Linux-specific system call which allows
efficient copying between two file descriptors, eliminating the need
to transfer data from the kernel to userspace and back. For
networking file systems like NFS and Ceph, it even eliminates copying
data to the client, and local filesystems like Btrfs and XFS can
create shared extents.
2022-04-23 13:32:05 +01:00
Jakub Zelenka
4ec92c6253
Update NEWS and www.conf with listen.backlog default change
2022-04-23 13:25:08 +01:00
Cristian Rodríguez
1e562683cb
fpm: listen backlog should default to -1 also on Linux
...
On linux -1 means system administrator choosen default or kernel
default, this varies between kernel versions or distributions
it used to be 128 now it is 4096.
2022-04-23 13:20:42 +01:00
George Peter Banyard
ef287bfceb
Minor refactoring of std string extension ( #8196 )
...
Mainly using more appropriate types, early returns, and moving the happy path to the primary scope (failure path is guarded by ``UNEXPECTED`` macros.
2022-04-23 12:15:13 +01:00
divinity76
820f695b05
Use bit shift to set bitflags in standard/file.h ( #8428 )
...
Nitpicking, this makes it practically impossible to accidentally use a number with 2 bits set in the future,
it's also my personal preference, its trivial to see "PHP_FILE_NO_DEFAULT_CONTEXT use bit 4" and that "the next unused bit is bit 5"
2022-04-23 12:11:26 +01:00
Ilija Tovilo
f06410a822
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Add missing news entry for GH-8421
2022-04-23 11:22:42 +02:00
Ilija Tovilo
bfad99f8a1
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Add missing news entry for GH-8421
2022-04-23 11:22:29 +02:00
Ilija Tovilo
4d6965dcec
Add missing news entry for GH-8421
2022-04-23 11:21:51 +02:00
Ilija Tovilo
91fe8075ab
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix GH-8421: Attributes that target functions are not valid for anonymous functions defined within a method
2022-04-23 11:19:34 +02:00