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

71461 Commits

Author SHA1 Message Date
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
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
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
Niels Dossche
6333ca8cb7 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  intl: Fix tests for icu update
2025-12-02 21:03:15 +01:00
Niels Dossche
78e3d05d7d Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  intl: Fix tests for icu update
2025-12-02 21:00:13 +01:00
Niels Dossche
4b63315ad5 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  intl: Fix tests for icu update
2025-12-02 20:59:41 +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
f622c3925b Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Tweak values for test on Windows (#20633)
2025-12-02 20:48:44 +01:00
Niels Dossche
881754ec1e Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Tweak values for test on Windows (#20633)
2025-12-02 20:48:36 +01:00
Niels Dossche
ad867ce651 Tweak values for test on Windows (#20633) 2025-12-02 20:48:24 +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
ddc8512267 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Suppress libxml deprecations
2025-12-02 16:45:39 +01:00
Ilija Tovilo
ed847f49c3 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Suppress libxml deprecations
2025-12-02 16:45:31 +01:00
Ilija Tovilo
685bd9de81 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Suppress libxml deprecations
2025-12-02 16:41:37 +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
Daniel Scherzer
aa795a6aa3 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20426: fix Spoofchecker::setRestrictionLevel() error (#20427)
2025-12-01 13:40:23 -08:00
Daniel Scherzer
355d296baa Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20426: fix Spoofchecker::setRestrictionLevel() error (#20427)
2025-12-01 13:39:38 -08:00
Daniel Scherzer
c343ede18d Fix GH-20426: fix Spoofchecker::setRestrictionLevel() error (#20427) 2025-12-01 13:37:49 -08:00
Michael Voříšek
f8c7dc19a4 Add "since PHP 8.1" to ReflectionXxx::setAccessible() deprecations (#20555) 2025-12-01 12:57:19 -08:00
Niels Dossche
6afe2cef78 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20614: SplFixedArray incorrectly handles references in deserialization
2025-11-30 10:43:27 +01:00
Niels Dossche
9734ba4d21 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20614: SplFixedArray incorrectly handles references in deserialization
2025-11-30 10:42:19 +01:00
Niels Dossche
366ed4c750 Fix GH-20614: SplFixedArray incorrectly handles references in deserialization
All other code caters to dereferencing array elements, except the
unserialize handler. This causes references to be present in the fixed
array even though this seems not intentional as reference assign is
otherwise impossible.
On 8.5+ this causes an assertion failure. On 8.3+ this causes references
to be present where they shouldn't be.

Closes GH-20616.
2025-11-30 10:41:32 +01:00
David Carlier
227541cb96 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20601: ftp_connect() timeout argument overflow.
2025-11-29 23:06:15 +00:00
David Carlier
1701589884 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20601: ftp_connect() timeout argument overflow.
2025-11-29 23:05:37 +00:00
David Carlier
4312a446d0 Fix GH-20601: ftp_connect() timeout argument overflow.
close GH-20603
2025-11-29 23:05:14 +00:00
David Carlier
848269d6a8 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20602: imagescale() overflow with large height values.
2025-11-29 13:32:18 +00:00
David Carlier
6d5490861f Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20602: imagescale() overflow with large height values.
2025-11-29 13:31:38 +00:00
David Carlier
c8e13af455 Fix GH-20602: imagescale() overflow with large height values.
close GH-20605
2025-11-29 13:30:49 +00:00