php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 11:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
140,488 Commits 547 Branches 1,481 Tags
php-8.4.15
Commit Graph

69388 Commits

Author SHA1 Message Date
Niels Dossche
3c1c7a0fe4 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  random: Fix memory leak when serialization fails (#20383)
 2025-11-04 08:33:31 +01:00
Niels Dossche
720e006982 random: Fix memory leak when serialization fails (#20383) 
Co-authored-by: Tim Düsterhus <timwolla@googlemail.com>
 2025-11-04 08:32:22 +01:00
Gina Peter Banyard
14ed75e560 Fix include paths for new pgsql tests 2025-11-04 04:42:42 +00:00
Gina Peter Banyard
afca514c3b Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Update NEWS for recent pgsql bugfix
  ext/pgsql: Fix segfaults when attempting to fetch row into a non-instantiable class name (#20180)
 2025-11-04 00:08:42 +00:00
Gina Peter Banyard
94dc6ae871 ext/pgsql: Fix segfaults when attempting to fetch row into a non-instantiable class name (#20180) 
Also fix Windows CI with Postgres and CLEAN sections

---------

Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
 2025-11-04 00:04:30 +00:00
David Carlier
6d12688c9e Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  ext/zip: fix memory leak when encryption is passed as userland array option.
 2025-11-02 21:16:55 +00:00
David Carlier
55f7303d73 ext/zip: fix memory leak when encryption is passed as userland array option. 
Similar issue fixed in GH-19936.

close GH-20363
 2025-11-02 21:15:07 +00:00
Niels Dossche
981b8c65ed Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Update zlib test to use separate file for flock()
 2025-11-01 09:30:11 +01:00
Niels Dossche
be8c8a9d6b Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Update zlib test to use separate file for flock()
 2025-11-01 09:30:04 +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
50c7f498b9 Reset Z_EXTRA_P(op2) of ZEND_INIT_FCALL for opcache file cache 
The offset becomes stale if the environment changes. We're currently relying on
other factors in the environment staying constant, e.g. send types. But this
seems to be the worst offender.

Partially addresses GH-17733
Closes GH-20328
 2025-10-31 17:50:02 +01:00
Niels Dossche
ae7117b177 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GH-20302: Freeing a phar alias may invalidate PharFileInfo objects
 2025-10-31 08:05:01 +01:00
Niels Dossche
6fe40de6e3 Fix GH-20302: Freeing a phar alias may invalidate PharFileInfo objects 
Closes GH-20345.
 2025-10-31 08:04:25 +01:00
Calvin Buckley
0a8cb02c64 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Move iconv const check into autoconf (8.3) (#20247)
 2025-10-29 14:38:35 -03:00
Calvin Buckley
d9bae1d1f5 Move iconv const check into autoconf (8.3) (#20247) 
See GH-16847
 2025-10-29 14:35:08 -03:00
Ilija Tovilo
76e26c6c3c Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Unparallelize imap
 2025-10-28 00:49:32 +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
David Carlier
f1a5c53544 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  ext/gd: Fix GH-19955 unit test.
 2025-10-27 17:45:40 +00:00
David Carlier
3c063abba1 ext/gd: Fix GH-19955 unit test. 
Adding guard for imagefttext() availability.

close GH-20309
 2025-10-27 17:45:17 +00:00
Niels Dossche
6dab33a438 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GH-20240: FTP with SSL: ftp_fput(): Connection timed out on successful writes
 2025-10-26 23:39:02 +01:00
Niels Dossche
8761c4e507 Fix GH-20240: FTP with SSL: ftp_fput(): Connection timed out on successful writes 
Looking at the strace, the timeout is only 1s which may be too low
anyway for checking for a response, but some servers also don't end up
replying finally anyway and close the connection already.

`data_available` was originally used for non-blocking downloads/uploads
and then reused for the shutdown sequence, but its error handling was
never adjusted to be silent.

Closes GH-20294.
 2025-10-26 23:38:09 +01:00
Niels Dossche
d4030362cf Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  ftp: Fix weird typo (#20295)
 2025-10-26 08:57:14 +01:00
Niels Dossche
61b0d589d6 ftp: Fix weird typo (#20295) 
* ftp: Fix weird typo

In 8827f8eca9 the async functions were
renamed to nb functions. So this was just a find+replace of async to nb.
The diff shows that "no asyncronous transfer to continue" was replaced
with "no nbronous transfer to continue". Makes no sense.

* Update ext/ftp/php_ftp.c

Co-authored-by: Jakub Zelenka <bukka@php.net>

---------

Co-authored-by: Jakub Zelenka <bukka@php.net>
 2025-10-26 08:56:56 +01:00
Niels Dossche
cb1f9327c4 Fix GH-20281: \Dom\Document::getElementById() is inconsistent after nodes are removed 
This worked for non-parsed elements already, but not for elements where
xmlAddID() returns early due to the ID already existing.
In that case what was missing is marking the attribute as an ID.

Closes GH-20283.
 2025-10-25 12:23:42 +02:00
Niels Dossche
e9c9b1fdcf Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Make bug70417.phpt less flaky
 2025-10-25 12:14:19 +02:00
Niels Dossche
ed9529a7d3 Make bug70417.phpt less flaky 
Closes GH-20287.
 2025-10-25 12:13:58 +02:00
Niels Dossche
9e4fbb5ca8 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix UAF in tidy when tidySetErrorBuffer() fails
 2025-10-24 21:20:43 +02:00
Niels Dossche
aebe5c92a9 Fix macro check that I forgot to commit 2025-10-24 21:20:28 +02:00
Niels Dossche
58df9fcf98 Fix UAF in tidy when tidySetErrorBuffer() fails 
We should not free `intern` as its stored in the object store as well,
so the object store will already free it, leading to a UAF when the
object store tries to read the object's fields.

Closes GH-20276.
 2025-10-24 21:19:47 +02:00
Niels Dossche
ef32a3bd8a Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Use MYSQL_TYPE constants instead of FIELD_TYPE
 2025-10-23 18:46:31 +02:00
Niels Dossche
c7fc819c2d Use MYSQL_TYPE constants instead of FIELD_TYPE 
The FIELD_TYPE constants are for BC. The JSON/VECTOR types are not
defined in FIELD_TYPE for libmysqlclient.
MYSQL_TYPE is available since MYSQL 5.0.0, so switch to that.

Since MYSQL_TYPEs are enums and not defines, we need version checks
instead.
JSON was added in mysql 8.0.0 in mysql/mysql-server@c240455145
JSON support was backported via mysql/mysql-server@3e14f9f in 5.7.8.
VECTOR was added in mysql 9.0.0 in mysql/mysql-server@8cd51511de

Replaces GH-20245.
 2025-10-23 18:45:34 +02:00
Jakub Zelenka
2a0931d347 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix GH-19798: XP_SOCKET XP_SSL: Incorrect condition for Win
 2025-10-23 15:22:21 +02:00
Jakub Zelenka
eef11e048d Fix GH-19798: XP_SOCKET XP_SSL: Incorrect condition for Win 
This fixes incorrect type conversion and subsequent check for Windows
where returned socket is not an int.

It should be noted that this is not really an issue as previous int
would get negative so the check should still work. The issue actually
happens only in master (PHP 8.5) where refactoring has been done and the
type changed.

Closes GH-19881
 2025-10-23 15:11:14 +02:00
Alexandre Daubois
572652e5de Fix GH-20217: ReflectionClass::isIterable() should return false for classes with property hooks (#20241) 2025-10-22 10:01:35 +02:00
Niels Dossche
913327d1fb Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  phar: Fix memory leak when opening temp file fails while trying to open gzip-compressed archive
 2025-10-21 20:04:36 +02:00
Niels Dossche
ce0df1a9d8 phar: Fix memory leak when opening temp file fails while trying to open gzip-compressed archive 
`filterparams` can leak if `php_stream_fopen_tmpfile()` fails.
To solve this, move the temp file creation first.

Closes GH-20220.
 2025-10-21 20:04:13 +02:00
Niels Dossche
40efac0d6c Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  phar: Fix file descriptor leak in phar_zip_flush() on failure.
 2025-10-21 19:36:30 +02:00
Niels Dossche
cc83761416 phar: Fix file descriptor leak in phar_zip_flush() on failure. 
Closes GH-20228.
 2025-10-21 19:36:08 +02:00
Ilija Tovilo
ed8a45c8e9 Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  [skip ci] Also skip check_default_conf_path.phpt on Windows & 8.2
  Revert "Fix Windows test for openssl-3.5 upgrade (#19384)"
 2025-10-21 01:25:24 +02:00
Ilija Tovilo
b751582705 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Also skip check_default_conf_path.phpt on Windows & 8.2
  Revert "Fix Windows test for openssl-3.5 upgrade (#19384)"
 2025-10-21 01:25:06 +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
Ilija Tovilo
1bfe9340b7 [skip ci] Skip openssl tests currently failing on 8.2 2025-10-21 00:55:08 +02:00
Ilija Tovilo
43621e1e3c Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  Fix Windows test for openssl-3.5 upgrade (#19384)
 2025-10-21 00:40:27 +02:00
Ilija Tovilo
5d8a3925d2 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix Windows test for openssl-3.5 upgrade (#19384)
 2025-10-21 00:40:21 +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
Niels Dossche
4c043d89ec Merge branch 'PHP-8.3' into PHP-8.4 
* PHP-8.3:
  phar: Fix memory leak when openssl polyfill returns garbage
 2025-10-20 22:04:09 +02:00
Niels Dossche
020bbea8fd phar: Fix memory leak when openssl polyfill returns garbage 
Closes GH-20210.
 2025-10-20 22:03:36 +02:00