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
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
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
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
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
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
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
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
Ilija Tovilo
1bfe9340b7
[skip ci] Skip openssl tests currently failing on 8.2
2025-10-21 00:55:08 +02:00
Shivam Mathur
0e17dcfe54
Fix Windows test for openssl-3.5 upgrade ( #19384 )
...
* Fix Windows test for openssl-3.5 upgrade
* Update ext/openssl/tests/check_default_conf_path.phpt
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de >
---------
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de >
2025-10-21 00:40:14 +02:00
Ilija Tovilo
c2fd6d6c44
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Disable inlining and inter-procedure-analyses for zend_string_equal_val() function that may be overriden for valgrind (#13099 )
Skip lc_ctype_inheritance.phpt on macos 15+
2025-10-15 19:38:51 +02:00
Ilija Tovilo
1edcce5554
Backport more curl 8.16 fixes
...
This hunk was missed in the 8.1 cherry-pick because curl_xferinfo() didn't exist
yet.
2025-10-07 18:33:17 +02:00
Jakub Zelenka
810aed1141
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Update NEWS with info about curl 8.16 compat fixes
Fix curl_setopt_ssl test for curl 8.16
Fix more curl 8.16 issues
Fix curl 8.16.0 compilation with zts
Fix curl build failure on macOS+curl 8.16
2025-10-07 14:30:22 +02:00
Jakub Zelenka
36859ad977
Fix curl_setopt_ssl test for curl 8.16
2025-10-07 14:18:41 +02:00
Ilija Tovilo
b810a23587
Fix more curl 8.16 issues
...
The CURLOPT_FOLLOWLOCATION seems like a gcc bug, where the integer extension of
bool to long is lost, but I was unable to reproduce on godbolt.org.
2025-10-07 14:18:41 +02:00
Ilija Tovilo
da75e41a6f
Fix curl 8.16.0 compilation with zts
2025-10-07 14:18:41 +02:00
Niels Dossche
1c8363d2bf
Fix curl build failure on macOS+curl 8.16
2025-10-07 14:18:41 +02:00
Derick Rethans
be5784dfec
Revert "Update timelib to 2022.14"
...
This reverts commits:
- a0329dbab0
- b42bd2a359
2025-09-15 14:17:32 +01:00
Derick Rethans
a0329dbab0
Update timelib to 2022.14
2025-09-15 10:38:53 +01:00
Niels Dossche
7016ad558b
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Reset global pointers to prevent use-after-free
2025-07-30 09:22:50 +02:00
Florian Engelhardt
3aaa8d3526
Reset global pointers to prevent use-after-free
...
Closes GH-19212.
2025-07-30 09:22:15 +02:00
Niels Dossche
d9d412645d
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Run FreebSD CI under 13.5
2025-07-22 15:52:16 +02:00
Niels Dossche
be88192594
Run FreebSD CI under 13.5
...
13.3 gives a 404 now.
Also pulls in a 8.4 fix to include xxhash from the bundled location.
Closes GH-19213.
2025-07-22 15:51:19 +02:00
Niels Dossche
27f24bd9bc
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fix test conflict between chmod_variation2 and file_variation5
2025-07-21 23:57:34 +02:00
Niels Dossche
605ee05491
Fix test conflict between chmod_variation2 and file_variation5
...
Both used "somelink".
See https://github.com/php/php-src/actions/runs/16427526464/job/46421461376
Closes GH-19208.
2025-07-21 23:57:21 +02:00
Niels Dossche
9eee4dd92b
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
ext/xml: Suppress libxml deprecation for `_xmlParserCtxt.inState` (#19131 )
2025-07-16 18:24:55 +02:00
Tim Düsterhus
a5df26691d
ext/xml: Suppress libxml deprecation for _xmlParserCtxt.inState ( #19131 )
...
The FreeBSD build fails due to the deprecation and -Werror:
2025-07-15T00:37:20.8390774Z /home/runner/work/php-src/php-src/ext/xml/compat.c:358:38: error: 'instate' is deprecated [-Werror,-Wdeprecated-declarations]
2025-07-15T00:37:20.8392577Z 358 | if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) {
2025-07-15T00:37:20.8393184Z | ^
2025-07-15T00:37:20.8394006Z /usr/local/include/libxml2/libxml/parser.h:309:33: note: 'instate' has been explicitly marked deprecated here
2025-07-15T00:37:20.8394903Z 309 | xmlParserInputState instate XML_DEPRECATED_MEMBER;
2025-07-15T00:37:20.8395413Z | ^
2025-07-15T00:37:20.8396166Z /usr/local/include/libxml2/libxml/xmlexports.h:74:50: note: expanded from macro 'XML_DEPRECATED_MEMBER'
2025-07-15T00:37:20.8397058Z 74 | #define XML_DEPRECATED_MEMBER __attribute__((deprecated))
2025-07-15T00:37:20.8397581Z | ^
2025-07-15T00:37:20.8425542Z 1 error generated.
2025-07-16 18:23:54 +02:00