com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/mcrypt/mcrypt.c ext/sockets/multicast.c ext/standard/html.c ext/standard/password.c ext/standard/php_crypt_r.c main/php_ini.c main/st reams/plain_wrapper.c sapi/phpdbg/phpdbg_prompt.c
[email protected] (Xinchen Hui)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: 65d77812fcc0275aed58fd74b8d17d09a7e21ef2 Author: Xinchen Hui <[email protected]> Mon, 10 Apr 2017 14:47:42 +0800 Parents: d65459f4eb764a77668a8f870ea85f3bbd12a13c 4bebcb84ad47e687fc3ef3a01b875aa04dfb72d0 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65d77812fcc0275aed58fd74b8d17d09a7e21ef2 Log: Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed condition check Changed paths: MM ext/mcrypt/mcrypt.c MM ext/sockets/multicast.c MM ext/standard/html.c MM ext/standard/password.c MM ext/standard/php_crypt_r.c MM main/php_ini.c MM main/streams/plain_wrapper.c MM sapi/phpdbg/phpdbg_prompt.c Diff: