archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source 
* PHP-8.1:
  Fix error checking in mysqlnd
This commit is contained in:
Kamil Tekiela 2023-08-10 15:25:03 +01:00
commit 7a4b213c1f
No known key found for this signature in database
GPG key ID: 0760BDAB1E89A1E3
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -47,6 +47,8 @@ PHP NEWS
. Fixed bug GH-11550 (MySQL Statement has a empty query result when . Fixed bug GH-11550 (MySQL Statement has a empty query result when
the response field has changed, also Segmentation fault). the response field has changed, also Segmentation fault).
(Yurunsoft) (Yurunsoft)
. Fixed invalid error message "Malformed packet" when connection is dropped.
(Kamil Tekiela)
- Opcache: - Opcache:
. Fixed bug GH-11715 (opcache.interned_strings_buffer either has no effect or . Fixed bug GH-11715 (opcache.interned_strings_buffer either has no effect or

1
ext/mysqlnd/mysqlnd_protocol_frame_codec.c
View file

@ -202,6 +202,7 @@ MYSQLND_METHOD(mysqlnd_pfc, send)(MYSQLND_PFC * const pfc, MYSQLND_VIO * const v
if (bytes_sent <= 0) { if (bytes_sent <= 0) {
DBG_ERR_FMT("Can't %zu send bytes", count); DBG_ERR_FMT("Can't %zu send bytes", count);
SET_CLIENT_ERROR(error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone); SET_CLIENT_ERROR(error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone);
bytes_sent = 0; // the return type is unsigned and 0 represents an error condition
} }
DBG_RETURN(bytes_sent); DBG_RETURN(bytes_sent);
} }