From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 9 Jan 2017 08:30:48 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~109
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=697809d425b2d495e39c948b435bd93445ae36bb;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
---

697809d425b2d495e39c948b435bd93445ae36bb