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

140621 Commits

Author SHA1 Message Date
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
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
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
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
Ilija Tovilo
baf193fc0d Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix yet another xml deprecation
2025-12-03 14:53:09 +01:00
Ilija Tovilo
0106134bb9 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix yet another xml deprecation
2025-12-03 14:53:02 +01:00
Ilija Tovilo
fe070fcc75 Fix yet another xml deprecation 2025-12-03 14:51:52 +01:00
Saki Takamachi
2ec8c29fda PHP-8.4 is now for PHP 8.4.17-dev 2025-12-03 14:52:20 +09: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
0d57840723 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  dom: Backport test for libxml changes
2025-12-02 20:52:40 +01:00
Niels Dossche
d542ee1045 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  dom: Backport test for libxml changes
2025-12-02 20:52:33 +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
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
7658ebffd5 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  xml: Backport more deprecation fixes
2025-12-02 20:09:56 +01:00
Niels Dossche
d543630049 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  xml: Backport more deprecation fixes
2025-12-02 20:09:47 +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
0cd1970921 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix deprecation warning for libxml SAX header (#18594)
2025-12-02 18:12:33 +01:00
Ilija Tovilo
9435c06129 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix deprecation warning for libxml SAX header (#18594)
2025-12-02 18:12:26 +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
Eric Mann
f940217bcb Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  PHP-8.3 is now for PHP 8.3.30-dev
2025-12-02 09:06:42 -08:00
Eric Mann
e10f6d702f PHP-8.3 is now for PHP 8.3.30-dev 2025-12-02 09:05:38 -08:00
Ilija Tovilo
9be8e52d64 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  dom: Fix compile warning due to misplaced const cast
2025-12-02 17:00:13 +01:00
Ilija Tovilo
16ce2ff13f Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  dom: Fix compile warning due to misplaced const cast
2025-12-02 17:00:06 +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
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
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
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
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
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
Niels Dossche
159a75c93c Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20584: Information Leak of Memory
  Fix GH-20583: Stack overflow in http_build_query via deep structures
2025-11-28 18:39:27 +01:00