Skip to content

Commit 04db9e1

Browse files
MaxKellermannMaxKellermann
committed
Merge tag 'php-8.3.15' into was-8.3.x
Tag for php-8.3.15
2 parents e5e075c + b611b97 commit 04db9e1

File tree

112 files changed

+1912
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1912
-430
lines changed

‎.cirrus.yml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@
3030
/ext/json @bukka
3131
/ext/libxml @nielsdos
3232
/ext/mbstring @alexdowad @youkidearitai
33-
/ext/mysqlnd @SakiTakamachi
33+
/ext/mysqli @bukka @kamil-tekiela
34+
/ext/mysqlnd @bukka @kamil-tekiela @SakiTakamachi
3435
/ext/odbc @NattyNarwhal
3536
/ext/opcache @dstogov
3637
/ext/openssl @bukka
3738
/ext/pcntl @devnexen
3839
/ext/pdo @SakiTakamachi
3940
/ext/pdo_dblib @SakiTakamachi
4041
/ext/pdo_firebird @SakiTakamachi
41-
/ext/pdo_mysql @SakiTakamachi
42+
/ext/pdo_mysql @kamil-tekiela @SakiTakamachi
4243
/ext/pdo_odbc @NattyNarwhal @SakiTakamachi
4344
/ext/pdo_pgsql @devnexen @SakiTakamachi
4445
/ext/pdo_sqlite @SakiTakamachi

‎.github/actions/freebsd/action.yml‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
name: FreeBSD
2+
runs:
3+
using: composite
4+
steps:
5+
- name: FreeBSD
6+
uses: vmactions/freebsd-vm@v1
7+
with:
8+
release: '13.3'
9+
usesh: true
10+
copyback: false
11+
# Temporarily disable sqlite, as FreeBSD ships it with disabled double quotes. We'll need to fix our tests.
12+
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269889
13+
prepare: |
14+
cd $GITHUB_WORKSPACE
15+
16+
kldload accf_http
17+
pkg install -y \
18+
autoconf \
19+
bison \
20+
gmake \
21+
re2c \
22+
icu \
23+
libiconv \
24+
png \
25+
freetype2 \
26+
enchant2 \
27+
bzip2 \
28+
t1lib \
29+
gmp \
30+
tidyp \
31+
libsodium \
32+
libzip \
33+
libxml2 \
34+
libxslt \
35+
openssl \
36+
oniguruma \
37+
pkgconf \
38+
webp \
39+
libavif \
40+
`#sqlite3` \
41+
curl
42+
43+
./buildconf -f
44+
./configure \
45+
--prefix=/usr/local \
46+
--enable-debug \
47+
--enable-option-checking=fatal \
48+
--enable-fpm \
49+
`#--with-pdo-sqlite` \
50+
--without-sqlite3 \
51+
--without-pdo-sqlite \
52+
--without-pear \
53+
--with-bz2 \
54+
--with-avif \
55+
--with-jpeg \
56+
--with-webp \
57+
--with-freetype \
58+
--enable-gd \
59+
--enable-exif \
60+
--with-zip \
61+
--with-zlib \
62+
--enable-soap \
63+
--enable-xmlreader \
64+
--with-xsl \
65+
--with-libxml \
66+
--enable-shmop \
67+
--enable-pcntl \
68+
--enable-mbstring \
69+
--with-curl \
70+
--enable-sockets \
71+
--with-openssl \
72+
--with-iconv=/usr/local \
73+
--enable-bcmath \
74+
--enable-calendar \
75+
--enable-ftp \
76+
--with-ffi \
77+
--enable-zend-test \
78+
--enable-dl-test=shared \
79+
--enable-intl \
80+
--with-mhash \
81+
--with-sodium \
82+
--with-config-file-path=/etc \
83+
--with-config-file-scan-dir=/etc/php.d
84+
gmake -j2
85+
mkdir /etc/php.d
86+
gmake install > /dev/null
87+
echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
88+
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
89+
echo opcache.preload_user=root >> /etc/php.d/opcache.ini
90+
run: |
91+
cd $GITHUB_WORKSPACE
92+
93+
export SKIP_IO_CAPTURE_TESTS=1
94+
export CI_NO_IPV6=1
95+
export STACK_LIMIT_DEFAULTS_CHECK=1
96+
sapi/cli/php run-tests.php \
97+
-P -q -j2 \
98+
-g FAIL,BORK,LEAK,XLEAK \
99+
--no-progress \
100+
--offline \
101+
--show-diff \
102+
--show-slow 1000 \
103+
--set-timeout 120 \
104+
-d zend_extension=opcache.so

‎.github/workflows/nightly.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -814,12 +814,14 @@ jobs:
814814
with:
815815
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
816816
- name: Build mysql-8.4
817+
if: ${{ !inputs.libmysqlclient_with_mysqli }}
817818
uses: ./.github/actions/build-libmysqlclient
818819
with:
819820
configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
820821
libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz
821822
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
822823
- name: Test mysql-8.4
824+
if: ${{ !inputs.libmysqlclient_with_mysqli }}
823825
uses: ./.github/actions/test-libmysqlclient
824826
with:
825827
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
@@ -979,3 +981,13 @@ jobs:
979981
run: .github/scripts/windows/build.bat
980982
- name: Test
981983
run: .github/scripts/windows/test.bat
984+
FREEBSD:
985+
name: FREEBSD
986+
runs-on: ubuntu-latest
987+
steps:
988+
- name: git checkout
989+
uses: actions/checkout@v4
990+
with:
991+
ref: ${{ inputs.branch }}
992+
- name: FreeBSD
993+
uses: ./.github/actions/freebsd

‎.github/workflows/push.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,3 +336,11 @@ jobs:
336336
${{ github.sha }} \
337337
$(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.sha }}) \
338338
> $GITHUB_STEP_SUMMARY
339+
FREEBSD:
340+
name: FREEBSD
341+
runs-on: ubuntu-latest
342+
steps:
343+
- name: git checkout
344+
uses: actions/checkout@v4
345+
- name: FreeBSD
346+
uses: ./.github/actions/freebsd

‎.github/workflows/root.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,17 @@ jobs:
4646
matrix:
4747
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
4848
with:
49-
asan_ubuntu_version: '20.04'
49+
asan_ubuntu_version: ${{
50+
(((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '24.04')
51+
|| '20.04' }}
5052
branch: ${{ matrix.branch.ref }}
5153
community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
5254
libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
5355
run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
5456
run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
55-
ubuntu_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9) && '22.04' || '20.04' }}
57+
ubuntu_version: ${{
58+
(((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '24.04')
59+
|| ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) && '22.04')
60+
|| '20.04' }}
5661
windows_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '2022' || '2019' }}
5762
secrets: inherit

‎NEWS‎

Lines changed: 92 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,95 @@
11
PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
3-
21 Nov 2024, PHP 8.3.14
3+
19 Dec 2024, PHP 8.3.15
4+
5+
- Calendar:
6+
. Fixed jdtogregorian overflow. (David Carlier)
7+
. Fixed cal_to_jd julian_days argument overflow. (David Carlier)
8+
9+
- COM:
10+
. Fixed bug GH-16991 (Getting typeinfo of non DISPATCH variant segfaults).
11+
(cmb)
12+
13+
- Core:
14+
. Fail early in *nix configuration build script. (hakre)
15+
. Fixed bug GH-16727 (Opcache bad signal 139 crash in ZTS bookworm
16+
(frankenphp)). (nielsdos)
17+
. Fixed bug GH-16799 (Assertion failure at Zend/zend_vm_execute.h:7469).
18+
(nielsdos)
19+
. Fixed bug GH-16630 (UAF in lexer with encoding translation and heredocs).
20+
(nielsdos)
21+
. Fix is_zend_ptr() huge block comparison. (nielsdos)
22+
. Fixed potential OOB read in zend_dirname() on Windows. (cmb)
23+
24+
- Curl:
25+
. Fixed bug GH-16802 (open_basedir bypass using curl extension). (nielsdos)
26+
. Fix various memory leaks in curl mime handling. (nielsdos)
27+
28+
- DOM:
29+
. Fixed bug GH-16777 (Calling the constructor again on a DOM object after it
30+
is in a document causes UAF). (nielsdos)
31+
. Fixed bug GH-16906 (Reloading document can cause UAF in iterator).
32+
(nielsdos)
33+
34+
- FPM:
35+
. Fixed GH-16432 (PHP-FPM 8.2 SIGSEGV in fpm_get_status). (Jakub Zelenka)
36+
37+
- GD:
38+
. Fixed GH-16776 (imagecreatefromstring overflow). (David Carlier)
39+
40+
- GMP:
41+
. Fixed bug GH-16890 (array_sum() with GMP can loose precision (LLP64)).
42+
(cmb)
43+
44+
- Hash:
45+
. Fixed GH-16711: Segfault in mhash(). (Girgias)
46+
47+
- Opcache:
48+
. Fixed bug GH-16770 (Tracing JIT type mismatch when returning UNDEF).
49+
(nielsdos, Dmitry)
50+
. Fixed bug GH-16851 (JIT_G(enabled) not set correctly on other threads).
51+
(dktapps)
52+
. Fixed bug GH-16902 (Set of opcache tests fail zts+aarch64). (nielsdos)
53+
54+
- OpenSSL:
55+
. Prevent unexpected array entry conversion when reading key. (nielsdos)
56+
. Fix various memory leaks related to openssl exports. (nielsdos)
57+
. Fix memory leak in php_openssl_pkey_from_zval(). (nielsdos)
58+
59+
- PDO:
60+
. Fixed memory leak of `setFetchMode()`. (SakiTakamachi)
61+
62+
- Phar:
63+
. Fixed bug GH-16695 (phar:// tar parser and zero-length file header blocks).
64+
(nielsdos, Hans Krentel)
65+
66+
- PHPDBG:
67+
. Fixed bug GH-15208 (Segfault with breakpoint map and phpdbg_clear()).
68+
(nielsdos)
69+
70+
- SAPI:
71+
. Fixed bug GH-16998 (UBSAN warning in rfc1867). (nielsdos)
72+
73+
- SimpleXML:
74+
. Fixed bug GH-16808 (Segmentation fault in RecursiveIteratorIterator
75+
->current() with a xml element input). (nielsdos)
76+
77+
- SOAP:
78+
. Fix make check being invoked in ext/soap. (Ma27)
79+
80+
- Standard:
81+
. Fixed bug GH-16905 (Internal iterator functions can't handle UNDEF
82+
properties). (nielsdos)
83+
. Fixed bug GH-16957 (Assertion failure in array_shift with
84+
self-referencing array). (nielsdos)
85+
86+
- Streams:
87+
. Fixed network connect poll interuption handling. (Jakub Zelenka)
88+
89+
- Windows:
90+
. Fixed bug GH-16849 (Error dialog causes process to hang). (cmb)
91+
92+
07 Nov 2024, PHP 8.3.14RC1
493

594
- CLI:
695
. Fixed bug GH-16373 (Shebang is not skipped for router script in cli-server
@@ -22,6 +111,8 @@ PHP NEWS
22111
. Fixed bug GH-16508 (Incorrect line number in inheritance errors of delayed
23112
early bound classes). (ilutov)
24113
. Fixed bug GH-16648 (Use-after-free during array sorting). (ilutov)
114+
. Fixed bug GH-15915 (overflow with a high value for precision INI).
115+
(David Carlier / cmb)
25116

26117
- Curl:
27118
. Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if

‎Zend/tests/gh16630.phpt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
--TEST--
2+
GH-16630 (UAF in lexer with encoding translation and heredocs)
3+
--EXTENSIONS--
4+
mbstring
5+
--INI--
6+
zend.multibyte=On
7+
zend.script_encoding=ISO-8859-1
8+
internal_encoding=EUC-JP
9+
--FILE--
10+
<?php
11+
$data3 = <<<CODE
12+
heredoc
13+
text
14+
CODE;
15+
echo $data3;
16+
?>
17+
--EXPECT--
18+
heredoc
19+
text

‎Zend/tests/gh16799.phpt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--TEST--
2+
GH-16799 (Assertion failure at Zend/zend_vm_execute.h)
3+
--FILE--
4+
<?php
5+
set_error_handler(function($_, $m) { throw new Exception($m); });
6+
class Test {
7+
static function test() {
8+
call_user_func("static::ok");
9+
}
10+
static function ok() {
11+
}
12+
}
13+
Test::test();
14+
?>
15+
--EXPECTF--
16+
Fatal error: Uncaught Exception: Use of "static" in callables is deprecated in %s:%d
17+
Stack trace:
18+
#0 %s(%d): {closure}(%d, 'Use of "static"...', %s, %d)
19+
#1 %s(%d): Test::test()
20+
#2 {main}
21+
thrown in %s on line %d

‎Zend/zend.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef ZEND_H
2121
#define ZEND_H
2222

23-
#define ZEND_VERSION "4.3.14"
23+
#define ZEND_VERSION "4.3.15"
2424

2525
#define ZEND_ENGINE_3
2626

0 commit comments

Comments
 (0)