1
0
mirror of https://github.com/php/php-src.git synced 2026-03-25 00:32:23 +01:00
Commit Graph

132539 Commits

Author SHA1 Message Date
Pierrick Charron
b233e9d063 Update versions for PHP 8.2.30 php-8.2.30 2025-12-16 12:18:12 -05:00
Jakub Zelenka
6e124d0df6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update NEWS with info about security issues
  Fix GHSA-www2-q4fc-65wf
  Fix GHSA-h96m-rvf9-jgm2
  Fix GHSA-8xr5-qppj-gvwj: PDO quoting result null deref
  Fix GH-20584: Information Leak of Memory
2025-12-16 15:30:54 +01:00
Jakub Zelenka
c48a9f42d3 Update NEWS with info about security issues 2025-12-16 15:26:59 +01:00
Niels Dossche
ed70b1ea43 Fix GHSA-www2-q4fc-65wf 2025-12-16 15:26:59 +01:00
Niels Dossche
8b801151bd Fix GHSA-h96m-rvf9-jgm2 2025-12-16 15:26:59 +01:00
Jakub Zelenka
727a4ddc39 Fix GHSA-8xr5-qppj-gvwj: PDO quoting result null deref 2025-12-16 15:26:59 +01:00
Niels Dossche
c5f28c7cf0 Fix GH-20584: Information Leak of Memory
The string added had uninitialized memory due to
php_read_stream_all_chunks() not moving the buffer position, resulting
in the same data always being overwritten instead of new data being
added to the end of the buffer.

This is backport as there is a security impact as described in
GHSA-3237-qqm7-mfv7 .
2025-12-16 15:26:58 +01:00
Ilija Tovilo
06b8b75d2e Fix curl protocols test expectation
Closes GH-17803

(cherry picked from commit 5b87faaaa7)
2025-12-15 23:51:48 +01:00
Niels Dossche
2c4163c90c Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Make bug70417.phpt less flaky
2025-12-15 08:14:48 +01:00
Niels Dossche
2bf2411976 Make bug70417.phpt less flaky
Closes GH-20287.

(cherry picked from commit ed9529a7d3)
2025-12-15 08:14:41 +01:00
Niels Dossche
4d28e2af9e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  sapi/fpm: remove use of variable-length arrays (#10645)
2025-12-14 23:30:54 +01:00
Max Kellermann
5850c7de7c sapi/fpm: remove use of variable-length arrays (#10645)
According to @cmb69, PHP does not require VLA support
(https://github.com/php/php-src/pull/10304#discussion_r1069343092).
VLAs are a bad idea for several reasons, so let's get rid of them.

Two of the VLAs were probably unintended; unlike C++, C doesn't have
the concept of "constant expressions", so an array with a "const"
length is technically still a VLA.  This is fixed by removing the
"const" variable, and using sizeof() instead.

(cherry picked from commit ff2a211d55)
2025-12-14 23:30:37 +01:00
Ilija Tovilo
9bd587801d Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix xcode-select
2025-12-13 20:29:56 +01:00
Ilija Tovilo
6cdb8bf0a2 Fix xcode-select
The old Xcode sticks around, so make sure we sort in reverse to pick the newer
version. Technically we should use something like sort -Vr, but -V doesn't exist
on macOS. But that won't be a problem until Xcode 100, which my great great
grand children can worry about.
2025-12-13 20:27:14 +01:00
Ilija Tovilo
4022ea11b8 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update clang in macOS build
2025-12-08 23:10:51 +01:00
Ilija Tovilo
cb413b5d5f Update clang in macOS build
This resolves a crash in release builds. This may be dropped again in the
future once the bugfix lands.

Co-authored by Alexandre Daubois <alex.daubois@gmail.com>
Co-authored by Arnaud Le Blanc <arnaud.lb@gmail.com>
Co-authored by Jakub Zelenka <bukka@php.net>

Closes GH-20669
2025-12-08 23:10:26 +01:00
Niels Dossche
d635c8788b xml: Fix deprecation properly by backporting the modern-but-actually-old implementation 2025-12-03 22:16:54 +01:00
Ilija Tovilo
fe070fcc75 Fix yet another xml deprecation 2025-12-03 14:51:52 +01:00
Niels Dossche
667b28cba4 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  intl: Fix tests for icu update
2025-12-02 20:59:34 +01:00
Niels Dossche
2b04e0831a intl: Fix tests for icu update 2025-12-02 20:59:26 +01:00
Niels Dossche
e81d8089cb Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  dom: Backport test for libxml changes
2025-12-02 20:52:27 +01:00
Niels Dossche
688902d455 dom: Backport test for libxml changes 2025-12-02 20:52:20 +01:00
Niels Dossche
9446a8e603 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  xml: Backport more deprecation fixes
2025-12-02 20:09:40 +01:00
Niels Dossche
dd2179433c xml: Backport more deprecation fixes 2025-12-02 20:09:31 +01:00
Ilija Tovilo
a7413712c2 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix deprecation warning for libxml SAX header (#18594)
2025-12-02 18:12:20 +01:00
Niels Dossche
903fcb45c3 Fix deprecation warning for libxml SAX header (#18594)
This header is deprecated, but fortunately it isn't actually used.
2025-12-02 18:10:46 +01:00
Ilija Tovilo
bdc09a0c50 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  dom: Fix compile warning due to misplaced const cast
2025-12-02 16:59:59 +01:00
Niels Dossche
bd67ba66a8 dom: Fix compile warning due to misplaced const cast 2025-12-02 16:59:51 +01:00
Ilija Tovilo
26b9395ad6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Suppress libxml deprecations
2025-12-02 16:38:08 +01:00
Ilija Tovilo
f7fb13eb07 Suppress libxml deprecations
Closes GH-20538
2025-12-02 16:37:50 +01:00
Ilija Tovilo
7ceee594bf Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Fix Symfony PHP requirements in community build
2025-11-18 00:52:14 +01:00
Ilija Tovilo
599d5ae64c [skip ci] Fix Symfony PHP requirements in community build
Symfony 8.1 and 8.0 now require PHP 8.4. Use 7.4 for PHP 8.3 and 8.2 builds. PHP
8.1 continues to be skipped. Sadly, this will need to be updated sporadically.

Closes GH-20512
2025-11-18 00:51:39 +01:00
Ilija Tovilo
b4e8635f5c Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  ext/pcre/tests: support libpcre2-10.47
2025-11-07 18:53:16 +01:00
Michael Orlitzky
bdf62b55bb ext/pcre/tests: support libpcre2-10.47
In the latest version of libpcre2, the offsets appearing in some
"compilation failed" warnings have increased by one, as a result of

  https://github.com/PCRE2Project/pcre2/pull/756

This is causing spurious test failures, so in this commit we replace
the hard-coded offsets by a regex that matches both values.

Gentoo-bug: https://bugs.gentoo.org/965018

Closes GH-20397
2025-11-07 18:52:48 +01:00
Ilija Tovilo
d03cf27afe Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Relax Zend/tests/concat_003.phpt
2025-11-06 14:18:27 +01:00
Ilija Tovilo
f4bd908259 [skip ci] Relax Zend/tests/concat_003.phpt
This test frequently fails in CI, where it took 1.3s, including a repeat due to
being marked as flaky. Bump this limit with a generous margin.
2025-11-06 14:15:56 +01:00
Ilija Tovilo
b9eaee18e4 [skip ci] Skip fpm tests crashing lsan on GHA
> LeakSanitizer has encountered a fatal error.

This happens only on 8.2/8.3 for some reason. Don't merge for 8.4 for now, we
can do that later if it reoccurs.
2025-11-05 13:22:44 +01:00
Ilija Tovilo
004a3985e7 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Avoid potential network port conflict in tests
2025-11-05 12:34:08 +01:00
Ilija Tovilo
c2f4508198 [skip ci] Avoid potential network port conflict in tests
These tests:

- ext/standard/tests/network/udp4loop.phpt
- ext/sockets/tests/socket_create_listen.phpt
- ext/sockets/tests/socket_create_listen-win32.phpt

all use port 31338. socket_create_listen.phpt and its win32 variant are mutually
exclusive, so they can't conflict. While udp4loop.phpt tries multiple ports, the
other tests do not. If udp4loop.phpt runs first and socket_create_listen.phpt
starts before it ends, the port is still blocked. Bump the start port for
udp4loop.phpt to avoid conflicts.
2025-11-05 12:29:31 +01:00
Niels Dossche
df423e4f08 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update zlib test to use separate file for flock()
2025-11-01 09:29:55 +01:00
Niels Dossche
c3d6bf65d5 Update zlib test to use separate file for flock()
This should prevent the nightly failures that fail with permission
denied on platforms with mandatory locks.

Closes GH-20351.
2025-11-01 09:29:45 +01:00
Niels Dossche
4098613012 [ci skip] Fix CODEOWNERS name 2025-10-30 19:11:57 +01:00
Ilija Tovilo
fc1bc9c695 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Unparallelize imap
2025-10-28 00:49:26 +01:00
Ilija Tovilo
20654ce4c9 [skip ci] Unparallelize imap
It's removed for PHP 8.4 anyway, and still regularly causes "Mailbox already
exists" errors despite the flaky flag.
2025-10-28 00:48:19 +01:00
Ilija Tovilo
270e3da220 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Fix nightly notification workflow url
2025-10-21 18:05:29 +02:00
Ilija Tovilo
7877de29e0 [skip ci] Fix nightly notification workflow url
jobs_url is a link to the api, rather than the website.

Also tweak wording, as we now only send one notification per workflow, rather
than per failed job.
2025-10-21 17:57:30 +02:00
Ilija Tovilo
db98c5717e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Auto-mark SKIP_PERF_SENSITIVE tests as flaky
2025-10-21 17:53:10 +02:00
Ilija Tovilo
99076ebfb0 [skip ci] Auto-mark SKIP_PERF_SENSITIVE tests as flaky
These can occasionally fail in CI.
2025-10-21 17:52:04 +02:00
Ilija Tovilo
f65a574a36 [skip ci] Also skip check_default_conf_path.phpt on Windows & 8.2
I don't know why the output is different only in 8.2. Revert for now to make CI
happy.
2025-10-21 01:23:58 +02:00
Ilija Tovilo
3f6c86a885 Revert "Fix Windows test for openssl-3.5 upgrade (#19384)"
This reverts commit 0e17dcfe54.
2025-10-21 01:23:29 +02:00