]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4' into PHP-8.0
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 29 Oct 2020 09:39:58 +0000 (10:39 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 29 Oct 2020 09:39:58 +0000 (10:39 +0100)
* PHP-7.4:
  Retain QUIT_SEND connection state

1  2 
ext/mysqlnd/mysqlnd_ps.c
ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_wireprotocol.c

Simple merge
Simple merge
Simple merge