php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,359 Commits 547 Branches 1,483 Tags
f8b217a3452e76113b833eec8a49bc2b6e8d1fdd
Commit Graph

127359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niklas Keller
f8b217a345 Fix pcre.jit on Apple Silicon 
This backports https://github.com/zherczeg/sljit/pull/105. Relates to bug #80435, however, it doesn't solve the bus error on PHP 8.0, but PHP 8.1 builds fine now.

Closes GH-9279.
 2022-08-31 14:22:44 +02:00
Christoph M. Becker
65619e868c Fix tests 
These changes have been overlooked, when 7908aae30c
had been reverted.
 2022-08-30 16:52:33 +02:00
Ben Ramsey
1862152145 Revert "Fix GH-9296: ksort behaves incorrectly on arrays with mixed keys" 
This reverts commit cd1aed8edd, as
discussed on internals (<https://externals.io/message/118483>).
 2022-08-30 09:13:46 -05:00
Sara Golemon
8be917b248 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Catch up dev version numbers
 2022-08-30 12:16:25 +00:00
Sara Golemon
3d6ed8c852 Catch up dev version numbers 2022-08-30 12:15:27 +00:00
Jakub Zelenka
bf97b3649d Merge branch 'PHP-8.0' into PHP-8.1 2022-08-29 22:33:02 +01:00
Jakub Zelenka
3503b1daa2 Fix bug #77780: "Headers already sent" when previous connection was aborted 
This change primarily splits SAPI deactivation to module and destroy
parts. The reason is that currently some SAPIs might bail out
on deactivation. One of those SAPI is PHP-FPM that can bail out on
request end if for example the connection is closed by the client
(web sever). The problem is that in such case the resources are not
freed and some values reset. The most visible impact can have not
resetting the PG(headers_sent) which can cause erorrs in the next
request. One such issue is described in #77780 bug which this fixes
and is also cover by a test in this commit. It seems reasonable
to separate deactivation and destroying of the resource which means
that the bail out will not impact it.
 2022-08-29 22:25:53 +01:00
Jakub Zelenka
7dc3d4b510 Merge branch 'PHP-8.0' into PHP-8.1 2022-08-29 16:42:58 +01:00
Jakub Zelenka
986e7319c5 Re-add fixed tests for GH-8885 2022-08-29 16:42:10 +01:00
Jakub Zelenka
36063873b0 Merge branch 'PHP-8.0' into PHP-8.1 2022-08-29 16:41:19 +01:00
Jakub Zelenka
bcdd9877e1 Fix GH-8885 tests on MacOS 2022-08-29 16:40:31 +01:00
Dmitry Stogov
4845d7026a Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  typo
 2022-08-29 17:13:16 +03:00
Dmitry Stogov
263a07e5b0 typo 2022-08-29 17:12:57 +03:00
Jakub Zelenka
be45f540ee Merge branch 'PHP-8.0' into PHP-8.1 2022-08-29 14:40:57 +01:00
Dmitry Menshikov
f92505cf24 Fix GH-8885: access.log with stderr writes logs to error_log after reload 
This fix allows restoring the the original stderr so the logs are
correctly written.
 2022-08-29 14:39:24 +01:00
Dmitry Stogov
172ac0a48d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leak
 2022-08-29 14:54:40 +03:00
Dmitry Stogov
4135e6011c Fix memory leak 
Fixes oss-fuzz #50616
 2022-08-29 14:53:48 +03:00
Christoph M. Becker
800df0feac Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Revert "Fix GH-9296: `ksort` behaves incorrectly on arrays with mixed keys"
 2022-08-29 12:43:25 +02:00
Christoph M. Becker
725cb4e8ad Revert "Fix GH-9296: ksort behaves incorrectly on arrays with mixed keys" 
This reverts commit cd1aed8edd, as
discussed on internals (<https://externals.io/message/118483>).
 2022-08-29 12:41:36 +02:00
Dmitry Stogov
a516e2992d Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix ext/opcache/tests/jit/inc_obj_004.phpt failure introduced by fd74ee7e90
 2022-08-29 12:35:46 +03:00
Dmitry Stogov
ce42dcf483 Fix ext/opcache/tests/jit/inc_obj_004.phpt failure introduced by fd74ee7e90 
This should fix GH-9445
 2022-08-29 12:30:14 +03:00
David Carlier
819df032aa Merge branch 'PHP-8.0' into PHP-8.1 2022-08-28 23:33:17 +01:00
David Carlier
e2a5428ca0 FPM fix strict prototype warnings. 
Closes GH-8986.
 2022-08-28 23:24:23 +01:00
Christoph M. Becker
2bd58dbcc4 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix pdo_dblib ext test conflicts when run in parallel
 2022-08-26 14:59:08 +02:00
Michael Voříšek
f86629569c Fix pdo_dblib ext test conflicts when run in parallel 
Closes GH-9430.
 2022-08-26 14:57:13 +02:00
Máté Kocsis
ce1358f9b0 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-8348 for nightly
 2022-08-26 10:57:38 +02:00
Michael Voříšek
34d9e089c2 Fix GH-8348 for nightly 2022-08-26 10:56:58 +02:00
Christoph M. Becker
502c630d01 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix oci8/pdo_oci random test failures when run in parallel
 2022-08-25 15:21:52 +02:00
Michael Voříšek
be4dd60c55 Fix oci8/pdo_oci random test failures when run in parallel 
Closes GH-9424.
 2022-08-25 15:20:50 +02:00
Christoph M. Becker
afc5ab4531 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  xmlRelaxNGCleanupTypes() is deprecated as of libxml2 2.10.0
 2022-08-25 15:11:41 +02:00
Christoph M. Becker
f59754694e xmlRelaxNGCleanupTypes() is deprecated as of libxml2 2.10.0 
The documentation[1] suggest to call `xmlCleanupParser()` instead, but
we are not doing that for reasons[2].  Thus, we do no longer call
`xmlRelaxNGCleanupTypes()` for libxml2 ≥ 2.10.0.

[1] <https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-relaxng.html#xmlRelaxNGCleanupTypes>
[2] <8742276eb3>

Closes GH-9417.
 2022-08-25 15:10:30 +02:00
Máté Kocsis
497820ea5f Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Test oci8 & pdo_oci in CI
 2022-08-24 16:46:38 +02:00
Michael Voříšek
c19116ff09 Test oci8 & pdo_oci in CI 
Closes GH-8348
 2022-08-24 16:45:34 +02:00
Michael Voříšek
2db2cab6ad Fix pdo_oci tests for PHP 8.1 
Closes GH-9051
 2022-08-24 14:39:45 +02:00
Dmitry Stogov
95befc786a Fix type inference 
Fixes oss-fuzz #50272
 2022-08-22 21:11:39 +03:00
Dmitry Stogov
2a33280ceb Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  JIT: Make code generation to be consistent with register allocation
 2022-08-22 19:55:10 +03:00
Dmitry Stogov
fd74ee7e90 JIT: Make code generation to be consistent with register allocation 
Fixes ext/opcache/tests/jit/add_014.phpt with opcache.jit=1205
 2022-08-22 19:53:33 +03:00
Dmitry Stogov
5bab9e94fd Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix memory leaks
 2022-08-22 17:47:43 +03:00
Dmitry Stogov
73c2d79fc5 Fix memory leaks 
Fixes oss-fuzz #50078
 2022-08-22 17:47:07 +03:00
Dmitry Stogov
5762fc52c6 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Tracing JIT: Fix incorrect guard elimination
 2022-08-22 15:39:47 +03:00
Dmitry Stogov
c9c51eb1f1 Tracing JIT: Fix incorrect guard elimination 
Fixes oss-fuzz #49917
 2022-08-22 15:38:41 +03:00
Christoph M. Becker
6427c4b858 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-9361: Segmentation fault on script exit
 2022-08-22 13:00:48 +02:00
Christoph M. Becker
bb341210f5 Fix GH-9361: Segmentation fault on script exit 
Using a lot of memory may overflow some `int` calculations; to avoid
that we make sure that the operands are promoted to `size_t`.

This issue has been analyzed by @chschneider.

Closes GH-9379.
 2022-08-22 12:59:17 +02:00
Máté Kocsis
3e0f144b2c Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix pdo_oci tests for PHP 8.0
 2022-08-22 09:28:29 +02:00
Michael Voříšek
305892580e Fix pdo_oci tests for PHP 8.0 2022-08-22 09:25:43 +02:00
Christoph M. Becker
9bd9e9a867 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix #79451: DOMDocument->replaceChild on doctype causes double free
 2022-08-19 18:13:48 +02:00
NathanFreeman
6027d441c1 Fix #79451: DOMDocument->replaceChild on doctype causes double free 
We have to reset intSubset if replacing doctype with another doctype node.

Closes GH-9201.
Closes GH-9376.
 2022-08-19 18:10:06 +02:00
David Carlier
9360cd6add Merge branch 'PHP-8.0' into PHP-8.1 2022-08-19 16:40:54 +01:00
David Carlier
52e312afb8 opcache jit fix message format for OpenBSD. 
like macOs it requires `ll`.
Closes #9380.
 2022-08-19 16:40:29 +01:00
George Peter Banyard
eb8ea14c66 Merge branch 'PHP-8.0' into PHP-8.1 2022-08-19 13:57:19 +01:00