diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-29 12:47:22 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-29 12:47:22 +0100 |
| commit | ce7c2cc05d7030214b9ef1fd4b0c4fd48d4997ee (patch) | |
| tree | beab41126db7edb504f9a500995ecb001a6d71fb | |
| parent | 9fdbc2a14a11203f2806a1d32c810889c8967880 (diff) | |
| parent | 78b44ddeba46c09f26c3036484e82b71398fb2f3 (diff) | |
| download | php-git-ce7c2cc05d7030214b9ef1fd4b0c4fd48d4997ee.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Report gone away error in one more place
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 5bd90e86dd..e11d42d8bd 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -1396,6 +1396,8 @@ php_mysqlnd_read_row_ex(MYSQLND_PFC * pfc, *data_size = 0; if (UNEXPECTED(FAIL == mysqlnd_read_header(pfc, vio, &header, stats, error_info))) { ret = FAIL; + SET_CONNECTION_STATE(connection_state, CONN_QUIT_SENT); + set_packet_error(error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone); } else { *data_size += header.size; buffer->ptr = pool->get_chunk(pool, *data_size + prealloc_more_bytes); |