Niels Dossche
c84b7ed0c5
Merge branch 'PHP-8.4'
...
* PHP-8.4:
[ci skip] UPGRADING fixes (#16893 )
2024-11-22 08:58:45 +01:00
Niels Dossche
9ee607823e
[ci skip] UPGRADING fixes ( #16893 )
...
It seems at one point these were (partially) rewritten, changing their
meaning. This patch fixes this.
2024-11-22 08:56:14 +01:00
David Carlier
ccda20b8d1
ext/sockets: Adding TCP_FUNCTION_BLK socket option for FreeBSD.
...
Allows to select an alternate TCP stack. For example with RACK,
a fast loss detection relying on timestamp per packet.
While it works system-wide, it can also apply in an individual socket level too.
close GH-16842
2024-11-21 23:00:06 +00:00
Ilija Tovilo
f44eaac48a
Simplify duplicate member flag check (GH-16874)
2024-11-21 14:54:57 +01:00
Christoph M. Becker
91f0b3bc04
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Reapply "Merge branch 'PHP-8.3' into PHP-8.4"
2024-11-20 23:25:33 +01:00
Christoph M. Becker
da81b5c8d2
Reapply "Merge branch 'PHP-8.3' into PHP-8.4"
...
This reverts commit 83ca37483c
, and
fixes the previous bad merge.
2024-11-20 23:24:43 +01:00
Marcos Marcolin
6bf703ad98
chore: remove unused variable. ( #16867 )
...
Co-authored-by: Marcos Marcolin <marcos@ixcsoft.com.br>
2024-11-20 22:46:38 +01:00
Christoph M. Becker
7b99da42ee
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Revert "Merge branch 'PHP-8.3' into PHP-8.4"
2024-11-20 19:46:14 +01:00
Christoph M. Becker
83ca37483c
Revert "Merge branch 'PHP-8.3' into PHP-8.4"
...
This reverts commit ae62779386
, reversing
changes made to 19e685ecc4
.
This was a bad merge; I'll have a look shortly.
2024-11-20 19:45:36 +01:00
Christoph M. Becker
81779c2863
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Fix GH-16851: JIT_G(enabled) not set correctly on other threads
2024-11-20 19:15:19 +01:00
Christoph M. Becker
ae62779386
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Fix GH-16851: JIT_G(enabled) not set correctly on other threads
2024-11-20 19:14:57 +01:00
Christoph M. Becker
58ed759ba7
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-16851: JIT_G(enabled) not set correctly on other threads
2024-11-20 19:12:40 +01:00
Dylan K. Taylor
ff3b4eca0e
Fix GH-16851: JIT_G(enabled) not set correctly on other threads
...
There doesn't seem to be a thread post-startup hook that runs after
zend_startup_cb() that could be used for this
this fix is similar to accel_startup_ok() as seen here: fc1db70f10/ext/opcache/ZendAccelerator.c (L2631-L2634)
Closes GH-16853.
2024-11-20 19:11:44 +01:00
Christoph M. Becker
ce55152060
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Skip file_put_contents_variation7.phpt on Windows
2024-11-20 15:52:11 +01:00
Christoph M. Becker
19e685ecc4
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Skip file_put_contents_variation7.phpt on Windows
2024-11-20 15:51:48 +01:00
Christoph M. Becker
38ec780015
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Skip file_put_contents_variation7.phpt on Windows
2024-11-20 15:50:54 +01:00
Christoph M. Becker
3656a84c39
Skip file_put_contents_variation7.phpt on Windows
...
While the test obviously succeeds on Windows, it may occasionally
conflict with file_put_contents_variation7-win32.phpt[1], so we skip it
like we do for many other of these tests which have win32 pendants.
[1] <https://github.com/php/php-src/actions/runs/11527743659/job/32093951818 >
Closes GH-16722.
2024-11-20 15:50:24 +01:00
Ilija Tovilo
3aa4973acd
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Enable -Werror for FreeBSD build
[skip ci] Add --no-progress to FreeBSD build
Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:29:52 +01:00
Ilija Tovilo
b3ab930a2f
Enable -Werror for FreeBSD build
2024-11-20 14:28:40 +01:00
Ilija Tovilo
2b50534e27
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
[skip ci] Add --no-progress to FreeBSD build
Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:28:09 +01:00
Ilija Tovilo
dbd6c945f9
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
[skip ci] Add --no-progress to FreeBSD build
Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:26:55 +01:00
Ilija Tovilo
02ef371eab
[skip ci] Add --no-progress to FreeBSD build
2024-11-20 14:25:54 +01:00
Ilija Tovilo
12f20ce407
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:25:25 +01:00
Ilija Tovilo
aca88baf5f
Move FreeBSD build to GitHub actions with QEMU
...
Closes GH-16822
2024-11-20 14:24:02 +01:00
Ilija Tovilo
73f1e1bb50
Merge branch 'PHP-8.4'
...
* PHP-8.4:
[skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:41 +01:00
Ilija Tovilo
5d4ae656c8
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
[skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:33 +01:00
Ilija Tovilo
3f1e1ee467
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
[skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:18 +01:00
Ilija Tovilo
aa40d3abcc
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
[skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:10 +01:00
Ilija Tovilo
e23ac8341a
[skip ci] Don't test mysqli with libmysqlclient 8.4
...
There are compile errors with 8.4 that we are no longer fixing.
2024-11-20 14:19:02 +01:00
Christoph M. Becker
7b9113178d
Merge branch 'PHP-8.4'
...
* PHP-8.4:
Make MySQLnd protocol stmt test work on 32bit
2024-11-20 13:54:30 +01:00
Christoph M. Becker
2187d20e28
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
Make MySQLnd protocol stmt test work on 32bit
2024-11-20 13:54:09 +01:00
Christoph M. Becker
9a0c35120f
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Make MySQLnd protocol stmt test work on 32bit
2024-11-20 13:53:35 +01:00
Christoph M. Becker
dedb0f8877
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Make MySQLnd protocol stmt test work on 32bit
2024-11-20 13:53:16 +01:00
Jakub Zelenka
c70b97d8eb
Make MySQLnd protocol stmt test work on 32bit
...
Closes GH-16869.
2024-11-20 13:52:53 +01:00
Ilija Tovilo
0b8fe1af87
Merge branch 'PHP-8.4'
...
* PHP-8.4:
[skip ci] Backport GA root workflow changes
2024-11-20 13:42:53 +01:00
Ilija Tovilo
72ab374d6b
Merge branch 'PHP-8.3' into PHP-8.4
...
* PHP-8.3:
[skip ci] Backport GA root workflow changes
2024-11-20 13:42:45 +01:00
Ilija Tovilo
378307cc4e
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
[skip ci] Backport GA root workflow changes
2024-11-20 13:42:36 +01:00
Ilija Tovilo
f8c37dc971
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
[skip ci] Backport GA root workflow changes
2024-11-20 13:42:28 +01:00
Ilija Tovilo
9acf0a4009
[skip ci] Backport GA root workflow changes
2024-11-20 13:41:39 +01:00
chx
e5c2bc41ed
Improve error message when overriding untyped property with typed property (GH-16866)
2024-11-20 11:59:29 +01:00
Jakub Zelenka
4b211a7769
Merge branch 'PHP-8.4'
2024-11-20 11:14:32 +01:00
Jakub Zelenka
7c96af42b7
Merge branch 'PHP-8.3' into PHP-8.4
2024-11-20 11:14:04 +01:00
Jakub Zelenka
ffff27f734
Merge branch 'PHP-8.2' into PHP-8.3
2024-11-20 11:12:19 +01:00
Jakub Zelenka
78c201a310
Update NEWS with security fixes info
2024-11-20 11:09:13 +01:00
Niels Dossche
f18d429b20
Fix GHSA-4w77-75f9-2c8w
2024-11-20 11:07:28 +01:00
Niels Dossche
f3ade203d7
Fix GHSA-r977-prxv-hc43
...
Move the bound check upwards. Since this doesn't generate output we can
check the bound first.
2024-11-20 11:07:04 +01:00
Jakub Zelenka
d37a20c4a2
Fix MySQLnd possible buffer over read in auth_protocol
2024-11-20 11:06:53 +01:00
Jakub Zelenka
a21e48a93a
Make MySQLnd protocol stmt test work on 32bit
2024-11-20 11:06:43 +01:00
Jakub Zelenka
c595455300
Fix GHSA-h35g-vwh6-m678: Mysqlnd - various heap buffer over-reads
...
This fixes issues causing buffer over-read that leak heap content:
- RESP packet field default left over for COM_LIST
- RESP packet upsert filename
- OK packet message
- RESP packet for stmt row data
- ps_fetch_from_1_to_8_bytes
- ps_fetch_float
- ps_fetch_double
- ps_fetch_time
- ps_fetch_date
- ps_fetch_datetime
- ps_fetch_string
- ps_fetch_bit
- RESP packet for query row data (just possible overflow on 32bit)
It also adds various protocol tests using a new fake server.
2024-11-20 11:06:26 +01:00
Niels Dossche
fba659abb9
Fix GHSA-g665-fm4p-vhff: OOB access in ldap_escape
2024-11-20 11:06:12 +01:00