php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
127,346 Commits 549 Branches 1,485 Tags
be45f540eed6ff57cbbe2f4fd265dc187a333858
Commit Graph

127346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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] <https://github.com/php/php-src/commit/8742276eb3905eb97a585417000c7b8df85006d4>

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
George Peter Banyard d6831e9a5c Revert Fixed bug #79451 
The fix for 8.1 and above is not identical and I don't know how to fix without breaking the whole build apparently
 2022-08-19 13:54:54 +01:00
George Peter Banyard 5739dd0030 Fix bad merge 2022-08-19 13:17:57 +01:00
George Peter Banyard c36a1ea1ae Merge branch 'PHP-8.0' into PHP-8.1 2022-08-19 12:52:58 +01:00
Tim Starling ba029fce68 Fix GH-9323: crash when the VM enters userspace code via the GC 
Closes GH-9323
 2022-08-19 12:50:02 +01:00
Tim Starling 410e5d48a3 Fix GCC 9.4 uninitialized variable warning 
ext/opcache/zend_accelerator_blacklist.c:295:4: error: ‘blacklist_path_length’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
 2022-08-19 12:46:55 +01:00
NathanFreeman 1d4300d870 Fix bug #79451: Using DOMDocument->replaceChild on doctype causes double free 
Closes GH-9201
 2022-08-19 12:46:23 +01:00
Christoph M. Becker 5d196d9e7c Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix GH-9316: $http_response_header is wrong for long status line
 2022-08-18 12:30:45 +02:00
Christoph M. Becker 72da418719 Fix GH-9316: $http_response_header is wrong for long status line 
While the reason-phrase in a HTTP response status line is usually
short, there is no actual limit specified by the RFCs.  As such, we
must not assume that the line fits into the buffer (which is currently
128 bytes large).

Since there is no real need to present the complete status line, we
simply read and discard the rest of a long line.

Co-authored-by: Tim Düsterhus <timwolla@googlemail.com>

Closes GH-9319.
 2022-08-18 12:27:54 +02:00
Jakub Zelenka 93bed982e8 Merge branch 'PHP-8.0' into PHP-8.1 2022-08-17 19:50:16 +01:00
Jakub Zelenka 84dcf578b1 Fix GH-9339: OpenSSL oid_file path check warning contains uninitialized path 2022-08-17 19:49:36 +01:00
Christoph M. Becker bf84ea0f48 Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Prepare for 8.0.24
 2022-08-17 12:54:50 +02:00
Gabriel Caruso 7c6316ad1c Prepare for 8.0.24 2022-08-17 11:56:42 +02:00
Alex Dowad 371367ce3e Reintroduce legacy 'SJIS-win' text encoding in mbstring 
In e2459857af, I combined mbstring's "SJIS-win" text encoding
into CP932. This was done after doing some testing which appeared
to show that the mappings for "SJIS-win" were the same as those
for "CP932".

Later, it was found that there was actually a small difference
prior to e2459857af when converting Unicode to CP932. The
mappings for the following two codepoints were different:

        CP932  SJIS-win
U+203E  0x7E   0x81 0x50
U+00A5  0x5C   0x81 0x8F

As shown, mbstring's "CP932" mapped Unicode's 'OVERLINE' and
'YEN SIGN' to the ASCII bytes which have conflicting uses in
most legacy Japanese text encodings. "SJIS-win" mapped these
to equivalent JIS X 0208 fullwidth characters.

Since e2459867af was not intended to cause any user-visible
change in behavior, I am rolling back the merge of "CP932"
and "SJIS-win".

It seems doubtful whether these two text encodings should
be kept separate or merged in a future release. An extensive
discussion of the related historical background and
compatibility issues involved can be found in this
GitHub thread:

https://github.com/php/php-src/issues/8308
 2022-08-16 20:18:54 +02:00