]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Tue, 9 Jun 2020 14:48:41 +0000 (16:48 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Tue, 9 Jun 2020 14:48:41 +0000 (16:48 +0200)
* PHP-7.4:
  Fix #62890: default_socket_timeout=-1 causes connection to timeout

1  2 
ext/openssl/xp_ssl.c

Simple merge