]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorRemi Collet <remi@php.net>
Tue, 20 Nov 2018 10:19:52 +0000 (11:19 +0100)
committerRemi Collet <remi@php.net>
Tue, 20 Nov 2018 10:19:52 +0000 (11:19 +0100)
* PHP-7.1:
  NEWS
  Fix #77151 ftp_close(): SSL_read on shutdown

1  2 
ext/ftp/ftp.c

diff --cc ext/ftp/ftp.c
Simple merge