com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/O ptimizer/block_pass.c
| From: | Dmitry Stogov | Date: | Mon, 13 Jan 2014 08:07:50 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/O ptimizer/block_pass.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75578@lists.php.net to get a copy of this message | ||
Commit: d09d64c15c282f91ce5af7791d52a8e2d1833aa9
Author: Dmitry Stogov <dmitry@zend.com> Mon, 13 Jan 2014 12:07:50 +0400
Parents: 69edad213aaf595cc4cc75215ac83a813b64121a fcd75690fe68c11ff9a327ee2e1ce3646b032431
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d09d64c15c282f91ce5af7791d52a8e2d1833aa9
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
Conflicts:
NEWS
Bugs:
https://bugs.php.net/66474
Changed paths:
MM ext/opcache/Optimizer/block_pass.c
Diff: