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.3'

Browse source 
* PHP-8.3:
  Fixed not to set CR_MALFORMED_PACKET to error if CR_SERVER_GONE_ERROR is already set
This commit is contained in:
Niels Dossche 2024-02-10 14:05:26 +01:00
commit 5e7783e200
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -2460,8 +2460,10 @@ MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_OK)(
payload_decoder_factory->m.init_ok_packet(&ok_response); payload_decoder_factory->m.init_ok_packet(&ok_response);
DBG_ENTER("mysqlnd_protocol::send_command_handle_OK"); DBG_ENTER("mysqlnd_protocol::send_command_handle_OK");
if (FAIL == (ret = PACKET_READ(payload_decoder_factory->conn, &ok_response))) { if (FAIL == (ret = PACKET_READ(payload_decoder_factory->conn, &ok_response))) {
DBG_INF("Error while reading OK packet"); if (error_info->error_no != CR_SERVER_GONE_ERROR) {
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet"); DBG_INF("Error while reading OK packet");
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
}
goto end; goto end;
} }
DBG_INF_FMT("OK from server"); DBG_INF_FMT("OK from server");