1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Commit Graph

143671 Commits

Author SHA1 Message Date
Kamil Tekiela
c566502d9e Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Squashed commit of the following:
2025-12-14 15:29:02 +00:00
Kamil Tekiela
c54abaa7e4 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Squashed commit of the following:
2025-12-14 15:28:01 +00:00
Kamil Tekiela
dbf56e0eba Squashed commit of the following:
commit c4adcbe582
Author: Kamil Tekiela <tekiela246@gmail.com>
Date:   Fri Oct 17 15:32:14 2025 +0100

    Add NEWS

commit 84a6e675af
Author: Kamil Tekiela <tekiela246@gmail.com>
Date:   Fri Oct 17 14:49:26 2025 +0100

    Handle errors in mysqli_begin_transaction
2025-12-14 15:25:34 +00:00
Niels Dossche
526938648e Fix test for 8.5+ 2025-12-14 13:35:03 +01:00
David Carlier
4d680fa1e2 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20678: resource created by GlobIterator crashes with fclose().
2025-12-14 11:59:14 +00:00
David Carlier
90475249dd Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20678: resource created by GlobIterator crashes with fclose().
2025-12-14 11:58:41 +00:00
David Carlier
97a90f4361 Fix GH-20678: resource created by GlobIterator crashes with fclose().
close GH-20697
2025-12-14 11:58:18 +00:00
Ilija Tovilo
d28b13c8d9 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix xcode-select
2025-12-13 20:30:14 +01:00
Ilija Tovilo
e82afcfc1b Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix xcode-select
2025-12-13 20:30:09 +01:00
Ilija Tovilo
b37a6e73b1 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix xcode-select
2025-12-13 20:30:03 +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
Niels Dossche
1172147855 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  standard: Fix error check for proc_open() command
2025-12-13 11:59:13 +01:00
Niels Dossche
c1c3bcc46b Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  standard: Fix error check for proc_open() command
2025-12-13 11:58:25 +01:00
Niels Dossche
038e53420b standard: Fix error check for proc_open() command
zval_get_string() can never return NULL, you need to use the try version
to get NULL. This is observable because the process will still spawn
even if an exception had occurred. To fix this, use the try variant.

Closes GH-20650.
2025-12-13 11:57:54 +01:00
Tim Düsterhus
3e7710c97d lexbor: Cherry pick "URL: fixed "heap-buffer-overflow" for scheme is "file"."
see lexbor/lexbor@65435d3e40

Fixes php/php-src#20668
2025-12-10 12:15:34 +01:00
Gina Peter Banyard
a3454b80e6 Fix GH-20553: PDO::FETCH_CLASSTYPE ignores $constructorArgs in PHP 8.5.0
We must assign the ctor_arguments regardless of modes.
This regression was introduced during the refactoring of PDO's internals

Closes GH-20595
2025-12-09 13:46:25 +00:00
Tim Düsterhus
8fd69e15e0 uri: Update to uriparser-0.9.9-79-gf47a7f0 (#20671)
This is in preparation of importing a fix for the uriparser/uriparser#282
security issue, which will likely depend on this refactoring to cleanly apply.
2025-12-09 11:52:42 +01:00
Ilija Tovilo
01742e9119 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Update clang in macOS build
2025-12-08 23:11:08 +01:00
Ilija Tovilo
14ea97aa03 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Update clang in macOS build
2025-12-08 23:11:02 +01:00
Ilija Tovilo
4969ef195b Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Update clang in macOS build
2025-12-08 23:10:56 +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
b98d553959 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  ldap: Fix memory leak in ldap_set_options()
2025-12-08 22:30:33 +01:00
Niels Dossche
5da5fa5528 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  ldap: Fix memory leak in ldap_set_options()
2025-12-08 22:30:16 +01:00
Niels Dossche
02a7c49564 ldap: Fix memory leak in ldap_set_options()
Closes GH-20659.
2025-12-08 22:29:03 +01:00
Linus Groh
c24d51e59c opcache: Remove unused sys/ipc.h include from ZendAccelerator.c (#20662)
As far as I can tell that's been there since the initial open source
release (commit 528006a). The header defines ftok() and a handful of
IPC_* constants, none of which are used here.

System V IPC is increasingly being replaced by POSIX IPC and may
therefore not be implemented on new and/or hobbyist operating systems
such as SerenityOS[1]. In the past that wasn't an issue as the OPCache
could be disabled, which is no longer possible as of PHP 8.5[2].

I was able to build with the include patched out, but we would prefer
this to be addressed upstream.

1: https://github.com/SerenityOS/serenity/pull/26465
2: https://github.com/php/php-src/pull/18961
2025-12-08 18:45:06 +01:00
Ilija Tovilo
e66e9059df Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix dumping function signature with dynamic class const lookup default argument
2025-12-08 16:19:53 +01:00
Ilija Tovilo
61eca669d9 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix dumping function signature with dynamic class const lookup default argument
2025-12-08 16:19:35 +01:00
Ilija Tovilo
26c0cbd93c Fix dumping function signature with dynamic class const lookup default argument
Fixes OSS-Fuzz #465488618
Closes GH-20651
2025-12-08 16:19:06 +01:00
Takuya Aramaki
5528df1a20 Fix TypeError message of setlocale() (#20625) 2025-12-06 18:06:19 +01:00
David Carlier
d9032b376f Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20620: bzcompress() overflow on large source size.
2025-12-05 22:32:28 +00:00
David Carlier
83b36de67d Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20620: bzcompress() overflow on large source size.
2025-12-05 22:31:14 +00:00
David Carlier
1f1147a666 Fix GH-20620: bzcompress() overflow on large source size.
close GH-20621
2025-12-05 22:30:51 +00:00
David Carlier
e910bbf144 ext/gd: fix build 2025-12-04 23:25:29 +00:00
David Carlier
400aa844a6 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20622: imagestring/imagestringup overflow/underflow.
2025-12-04 23:16:08 +00:00
David Carlier
2c2852ae8e Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20622: imagestring/imagestringup overflow/underflow.
2025-12-04 23:14:01 +00:00
David Carlier
9f654decdc Fix GH-20622: imagestring/imagestringup overflow/underflow.
close GH-20623
2025-12-04 23:13:29 +00:00
Ilija Tovilo
f39ae2fc67 Fix warning on 8.5 2025-12-04 13:51:16 +01:00
Alexandre Daubois
d74085bf8c Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20370: forbid user stream filters to violate typed property constraints (#20373)
2025-12-04 09:11:52 +01:00
Alexandre Daubois
175548e868 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20370: forbid user stream filters to violate typed property constraints (#20373)
2025-12-04 09:11:09 +01:00
Alexandre Daubois
77f2d12849 Fix GH-20370: forbid user stream filters to violate typed property constraints (#20373) 2025-12-04 09:09:30 +01:00
Oblivionsage
6a0da6dc2e Fix GH-20631: Integer underflow in exif HEIF parsing
When pos.size is less than 2, the subtraction pos.size - 2 causes
an unsigned integer underflow, resulting in a ~4GB allocation attempt.

Add minimum size check (pos.size >= 2) to prevent the underflow.

Closes GH-20630.
2025-12-03 22:30:12 +01:00
Niels Dossche
aa82371358 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  xml: Fix deprecation properly by backporting the modern-but-actually-old implementation
2025-12-03 22:17:25 +01:00
Niels Dossche
2521c348da Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  xml: Fix deprecation properly by backporting the modern-but-actually-old implementation
2025-12-03 22:17:18 +01:00
Niels Dossche
a960edc077 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  xml: Fix deprecation properly by backporting the modern-but-actually-old implementation
2025-12-03 22:17:07 +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
David Carlier
f90d1f7aa6 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20603 issue on windows 32 bits.
2025-12-03 20:22:50 +00:00
David Carlier
51f4450b47 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20603 issue on windows 32 bits.
2025-12-03 20:22:38 +00:00
David Carlier
ff51ac161d Fix GH-20603 issue on windows 32 bits.
the timeout needed to be unsigned.

close GH-20634
2025-12-03 20:22:14 +00:00