]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Mon, 9 Jan 2017 08:30:48 +0000 (16:30 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 9 Jan 2017 08:30:48 +0000 (16:30 +0800)
* PHP-7.0:
  Fixed bug #73854 (Always true condition in php_openssl_sockop_io)

1  2 
ext/openssl/xp_ssl.c

Simple merge