diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-29 10:39:58 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-29 10:39:58 +0100 |
| commit | d784c65cca34e55e52887bfa4975594958f28181 (patch) | |
| tree | 55155bddeb121e9962d5ecce6fe0d1bf6c8bd4b2 /ext/mysqlnd/mysqlnd_ps.c | |
| parent | 246b8b20b2cbed5ce8f5e88e9b50b7f387f0ebb7 (diff) | |
| parent | 24537a73c010d5ce56d83cae36c15b9c8d1a1a13 (diff) | |
| download | php-git-d784c65cca34e55e52887bfa4975594958f28181.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Retain QUIT_SEND connection state
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 274924c2a3..38e19484da 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -886,7 +886,9 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES * result, void * param, const unsi COPY_CLIENT_ERROR(stmt->error_info, row_packet->error_info); } } - SET_CONNECTION_STATE(&conn->state, CONN_READY); + if (GET_CONNECTION_STATE(&conn->state) != CONN_QUIT_SENT) { + SET_CONNECTION_STATE(&conn->state, CONN_READY); + } result->unbuf->eof_reached = TRUE; /* so next time we won't get an error */ } else if (row_packet->eof) { DBG_INF("EOF"); |