Skip to content

Commit 5e7783e

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fixed not to set CR_MALFORMED_PACKET to error if CR_SERVER_GONE_ERROR is already set
2 parents 9fc7be8 + ca60912 commit 5e7783e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ext/mysqlnd/mysqlnd_wireprotocol.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2460,8 +2460,10 @@ MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_OK)(
24602460
payload_decoder_factory->m.init_ok_packet(&ok_response);
24612461
DBG_ENTER("mysqlnd_protocol::send_command_handle_OK");
24622462
if (FAIL == (ret = PACKET_READ(payload_decoder_factory->conn, &ok_response))) {
2463-
DBG_INF("Error while reading OK packet");
2464-
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
2463+
if (error_info->error_no != CR_SERVER_GONE_ERROR) {
2464+
DBG_INF("Error while reading OK packet");
2465+
SET_CLIENT_ERROR(error_info, CR_MALFORMED_PACKET, UNKNOWN_SQLSTATE, "Malformed packet");
2466+
}
24652467
goto end;
24662468
}
24672469
DBG_INF_FMT("OK from server");

0 commit comments

Comments
 (0)