Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed condition check

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

diff --cc ext/sockets/multicast.c
Simple merge

diff --cc ext/standard/html.c
Simple merge

diff --cc ext/standard/password.c
Simple merge

diff --cc ext/standard/php_crypt_r.c
Simple merge

diff --cc main/php_ini.c
Simple merge

diff --cc main/streams/plain_wrapper.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge