Skip to content

Commit c2ca7bc

Browse files
committed
Merge branch 'PHP-8.5' into PHP-8.6
2 parents 0ceaea9 + b695128 commit c2ca7bc

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ PHP NEWS
5858
properties after running out of memory while escaping a property name.
5959
(adapik)
6060

61+
- MySQLnd:
62+
. Fixed bug GH-24609 (OK packets without an info message rejected on x32
63+
builds). (lazerg)
64+
6165
- Opcache:
6266
. Fixed tracing JIT returning a wrapped integer instead of a float on
6367
integer overflow after an integer was compared with a float or

‎ext/mysqlnd/mysqlnd_wireprotocol.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ php_mysqlnd_rset_header_read(MYSQLND_CONN_DATA * conn, void * _packet)
11271127
zend_uchar * const buf = (zend_uchar *) pfc->cmd_buffer.buffer;
11281128
const zend_uchar * p = buf;
11291129
const zend_uchar * const begin = buf;
1130-
size_t len;
1130+
zend_ulong len;
11311131
MYSQLND_OPTIONAL_UINT64_T len_ll;
11321132

11331133
DBG_ENTER("php_mysqlnd_rset_header_read");

0 commit comments

Comments
 (0)