diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-29 12:47:32 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-29 12:47:32 +0100 |
| commit | 60ab7a36c7b35caf01ccf6a12eaa5ec4430cbf9b (patch) | |
| tree | 609d92a3175fab148fed7b23619f9d554b80ed72 | |
| parent | 4273ec8551097d6050dc2e400aaa590a8a88fe2a (diff) | |
| parent | ce7c2cc05d7030214b9ef1fd4b0c4fd48d4997ee (diff) | |
| download | php-git-60ab7a36c7b35caf01ccf6a12eaa5ec4430cbf9b.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
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); |