diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-01-12 21:14:42 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-01-12 21:15:57 +0100 |
| commit | da5e09ad0389f53cdc78591442a3df1ff54c6ff0 (patch) | |
| tree | eb0eebcbc70e392348e4966a41d17d0896903070 /ext/mysqlnd/mysqlnd_ps.c | |
| parent | af2de536d35c9a450b12d9c9f207898e9d864951 (diff) | |
| parent | bd75f9e61375c7632bb55b0d49b470ecd94e8ec7 (diff) | |
| download | php-git-da5e09ad0389f53cdc78591442a3df1ff54c6ff0.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index c805e6f111..256bbe4d47 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -2032,8 +2032,9 @@ MYSQLND_METHOD(mysqlnd_stmt, free_result)(MYSQLND_STMT * const s) stmt->state = MYSQLND_STMT_PREPARED; } - /* Line is free! */ - SET_CONNECTION_STATE(&conn->state, CONN_READY); + if (GET_CONNECTION_STATE(&conn->state) != CONN_QUIT_SENT) { + SET_CONNECTION_STATE(&conn->state, CONN_READY); + } DBG_RETURN(PASS); } |