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

130284 Commits

Author SHA1 Message Date
Dmitry Stogov
865f2c026e Merge branch 'PHP-8.2'
* PHP-8.2:
  opcache: fix syntax error introduced in 261a08af65 (#9821)
2022-10-24 20:43:31 +03:00
Dmitry Stogov
6567d49726 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  opcache: fix syntax error introduced in 261a08af65 (#9821)
2022-10-24 20:43:18 +03:00
Kévin Dunglas
af75eaf9bf opcache: fix syntax error introduced in 261a08af65 (#9821) 2022-10-24 20:42:55 +03:00
George Peter Banyard
76b8bace07 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix OpCache build after 0b0259a418
2022-10-24 15:18:03 +01:00
George Peter Banyard
cb3adf351d Fix OpCache build after 0b0259a418
The intersection type needs to be marked as being allocated on the arena otherwise zend_persist_type() tries to free it and corrupts the Zend MM Heap

Also we only need to allocate the space for a list of size 1 and not the whole length of the intersection type
2022-10-24 15:17:26 +01:00
Christoph M. Becker
c0789feb31 Merge branch 'PHP-8.2'
* PHP-8.2:
  Update new test to use EXTENSIONS section instead of SKIPIF
2022-10-24 15:03:25 +02:00
Christoph M. Becker
797ee86170 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update new test to use EXTENSIONS section instead of SKIPIF
2022-10-24 15:02:55 +02:00
Christoph M. Becker
b4fb66463b Update new test to use EXTENSIONS section instead of SKIPIF 2022-10-24 15:02:05 +02:00
Tyson Andre
c4ecd82f93 Make inspecting SplFixedArray instances more memory efficient/consistent, change print_r null props handling (#9757)
* Make handling of SplFixedArray properties more consistent

Create a brand new reference counted array every time in SplFixedArray
to be freed by the callers (or return null).
Switch from overriding `get_properties` to overriding `get_properties_for` handler

* Print objects with null hash table like others in print_r

Noticed when working on subsequent commits for SplFixedArray.
Make whether zend_get_properties_for returns null or an empty array
invisible to the end user - it would be always be a non-null array for
user-defined classes.
Always print newlines with `\n\s*(\n\s*)` after objects

Noticed when working on SplFixedArray changes, e.g. in
ext/spl/tests/SplFixedArray__construct_param_null.phpt
2022-10-24 08:33:25 -04:00
George Peter Banyard
6e8f2ba6b8 Merge branch 'PHP-8.2'
* PHP-8.2:
  Revert 01eb06a0de
  Convert Implicitly nullable pure intersection types to DNF
2022-10-24 11:42:41 +01:00
George Peter Banyard
8c2df899d0 Revert 01eb06a0de
We do not need this shim anymore since it is converted to a proper DNF type at compile time
2022-10-24 11:41:42 +01:00
George Peter Banyard
0b0259a418 Convert Implicitly nullable pure intersection types to DNF
If we don't then Reflection would give us a ReflectionIntersectionType even if the type is currently displayed as (X&Y)|null
2022-10-24 11:39:54 +01:00
Dmitry Stogov
a26d83a1d0 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fixed test
  JIT: Fix incorrect EX(opline) override
2022-10-24 12:10:15 +03:00
Dmitry Stogov
e0d9a29958 Fixed test 2022-10-24 12:10:08 +03:00
Dmitry Stogov
17706c3e88 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  JIT: Fix incorrect EX(opline) override
2022-10-24 12:03:36 +03:00
Dmitry Stogov
261a08af65 JIT: Fix incorrect EX(opline) override
Fixes oss-fuzz #52674
2022-10-24 12:02:28 +03:00
Stanislav Malyshev
43950c3ca5 Merge branch 'PHP-8.2' 2022-10-23 18:54:32 -06:00
Stanislav Malyshev
9855fdd21a Merge branch 'PHP-8.1' into PHP-8.2 2022-10-23 18:53:56 -06:00
Stanislav Malyshev
2caa79e963 Merge branch 'PHP-8.0' into PHP-8.1 2022-10-23 18:53:26 -06:00
Stanislav Malyshev
80ccaa3e36 Merge branch 'PHP-7.4' into PHP-8.0 2022-10-23 18:52:56 -06:00
Stanislav Malyshev
2669ed7d77 Update NEWS 2022-10-23 18:50:53 -06:00
Stanislav Malyshev
f89284541c Merge branch 'PHP-8.2' 2022-10-23 18:49:34 -06:00
Stanislav Malyshev
dedaf40d21 Merge branch 'PHP-8.1' into PHP-8.2 2022-10-23 18:49:30 -06:00
Stanislav Malyshev
33e10cb1e0 Merge branch 'PHP-8.0' into PHP-8.1 2022-10-23 18:49:26 -06:00
Stanislav Malyshev
1d83a407d1 Merge branch 'PHP-7.4' into PHP-8.0 2022-10-23 18:49:21 -06:00
Christoph M. Becker
d50532be91 Fix #81739: OOB read due to insufficient validation in imageloadfont()
If we swap the byte order of the relevant header bytes, we need to make
sure again that the following multiplication does not overflow.
2022-10-23 18:41:48 -06:00
Jakub Zelenka
1ea8c8217e Make test for bug #51056 (blocking read) more reliable
It seems that it might sometimes not return the last 0 bytes on Windows
because it likely signals EOF before that. We do not really need to
check it so only non 0 lines are printed.
2022-10-23 16:57:59 +01:00
Jakub Zelenka
b8d013a48d Merge branch 'PHP-8.2' 2022-10-23 12:41:51 +01:00
Jakub Zelenka
b732d80329 Fix bug GH-9779: stream_copy_to_stream fail when dest in append mode 2022-10-23 12:40:22 +01:00
Jakub Zelenka
365178ac5d Move tsrm_is_managed_thread() check after tsrm_is_shutdown() 2022-10-23 12:23:04 +01:00
Adam Saponara
265f3998c0 Fix GH-9709: Guard against current_execute_data==NULL in is_handle_exception_set 2022-10-23 00:50:22 +01:00
David Carlier
dbedb69f6a Merge branch 'PHP-8.1' into PHP-8.2 2022-10-23 00:46:46 +01:00
David Carlier
fe06c5ef60 Merge branch 'PHP-8.0' into PHP-8.1 2022-10-23 00:46:25 +01:00
Adam Saponara
45e224cf51 Fix GH-9709: Guard against current_execute_data==NULL in is_handle_exception_set 2022-10-23 00:46:05 +01:00
Jakub Zelenka
59f8f2df9c Merge branch 'PHP-8.2' 2022-10-23 00:40:19 +01:00
Jakub Zelenka
3e2184f795 Fix OpenSSL conflicting merge for compilation issue with old digests 2022-10-23 00:39:42 +01:00
Bob Weinand
18cb372afd Merge branch 'PHP-8.2' 2022-10-22 22:09:21 +00:00
Bob Weinand
5e9654be03 Fixed missing run_time_cache for preloaded arena allocated internal functions
This effectively affected all preloaded enums, leading them to possibly share a run_time_cache__ptr slot with unrelated functions. (Given that these were not set again.)
This bugfix is not accompanied by a test, due to how hard to trigger it was and getting a crash also depends a lot on the precise alignment of whether a cache entry accidentally overlapping has been used etc.
2022-10-22 22:07:41 +00:00
Jakub Zelenka
14c2480396 Merge branch 'PHP-8.2' 2022-10-22 22:15:12 +01:00
Jakub Zelenka
cb3d5a772d Merge branch 'PHP-8.1' into PHP-8.2 2022-10-22 22:14:27 +01:00
Jakub Zelenka
ec844ccc3f Merge branch 'PHP-8.0' into PHP-8.1 2022-10-22 22:12:05 +01:00
Jakub Zelenka
fa1b6ab5db Fix GH-8430: OpenSSL compiled with old disgests does not build
Specifically no-md2, no-md4 or no-rmd160 were not supported
2022-10-22 22:11:05 +01:00
George Peter Banyard
8e9fa2bd23 Convert mod user FINISH macro to static function 2022-10-22 12:47:34 +01:00
George Peter Banyard
3917018806 Inline macros and add argument to FINISH macro 2022-10-22 12:47:34 +01:00
George Peter Banyard
2ad96b0812 Assert that mandatory user handlers are defined 2022-10-22 12:47:34 +01:00
George Peter Banyard
51888425da Drop struct union as access is now always named 2022-10-22 12:47:34 +01:00
George Peter Banyard
2ddd68aa20 Free handles by name directly 2022-10-22 12:47:34 +01:00
George Peter Banyard
5b40d06680 Refactor session_set_save_handler()
Use proper ZPP callables with FCI/FCC
2022-10-22 12:47:34 +01:00
George Peter Banyard
15c0df76b5 Add regression test for not setting optional closures again 2022-10-22 12:47:34 +01:00
George Peter Banyard
5465eff03c Remove tests as they are identical to already existing basic tests 2022-10-22 12:47:34 +01:00