]> granicus.if.org Git - php/commit
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)
commit697809d425b2d495e39c948b435bd93445ae36bb
treed2ce1dec7ec14004aba8127b7e9d40c5d5477c4c
parentbf6eb656732ca7f09bcfdcc7e11fb3b64a3dcc7d
parentf7cb79431f621381722f504e75d1e71e72df6de9
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
ext/openssl/xp_ssl.c