diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-30 15:06:40 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-30 15:06:40 +0100 |
| commit | 39c59e084c8f5fc9b0ce379fbf62dbdf547e400b (patch) | |
| tree | 76c28f69d342cfaeabcd45c329ba7ded7c2048aa /ext | |
| parent | a3d0752a0a44c3e51656cdba4bad8035175312f0 (diff) | |
| parent | 24a19cc232668b5b839932a120d663b903729777 (diff) | |
| download | php-git-39c59e084c8f5fc9b0ce379fbf62dbdf547e400b.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Suppress stream errors in mysqlnd
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_vio.c | 1 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/ext/mysqlnd/mysqlnd_vio.c b/ext/mysqlnd/mysqlnd_vio.c index bc59cbeed8..e33761f278 100644 --- a/ext/mysqlnd/mysqlnd_vio.c +++ b/ext/mysqlnd/mysqlnd_vio.c @@ -263,6 +263,7 @@ MYSQLND_METHOD(mysqlnd_vio, post_connect_set_opt)(MYSQLND_VIO * const vio, const } net_stream->chunk_size = vio->data->options.net_read_buffer_size; + net_stream->flags |= PHP_STREAM_FLAG_SUPPRESS_ERRORS; } DBG_VOID_RETURN; diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index e11d42d8bd..33a000d9a6 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -971,7 +971,6 @@ size_t php_mysqlnd_cmd_write(MYSQLND_CONN_DATA * conn, void * _packet) MYSQLND_VIO * vio = conn->vio; MYSQLND_STATS * stats = conn->stats; MYSQLND_CONNECTION_STATE * connection_state = &conn->state; - const unsigned int error_reporting = EG(error_reporting); size_t sent = 0; DBG_ENTER("php_mysqlnd_cmd_write"); @@ -981,10 +980,6 @@ size_t php_mysqlnd_cmd_write(MYSQLND_CONN_DATA * conn, void * _packet) */ pfc->data->m.reset(pfc, stats, error_info); - if (error_reporting) { - EG(error_reporting) = 0; - } - MYSQLND_INC_CONN_STATISTIC(stats, STAT_PACKETS_SENT_CMD); #ifdef MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND @@ -1017,10 +1012,6 @@ size_t php_mysqlnd_cmd_write(MYSQLND_CONN_DATA * conn, void * _packet) } } end: - if (error_reporting) { - /* restore error reporting */ - EG(error_reporting) = error_reporting; - } if (!sent) { SET_CONNECTION_STATE(connection_state, CONN_QUIT_SENT); } |