com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Mon, 13 Jan 2014 14:06:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75593@lists.php.net to get a copy of this message | ||
Commit: 7864fcaec96d8fea1626dbb9c76b0620fa694b4a
Author: Dmitry Stogov <dmitry@zend.com> Mon, 13 Jan 2014 18:06:49 +0400
Parents: 9b74dc4a07a2c5178cbedc41b0beedd979537ffa ce2f024e9ff4283d22b30d0c20f83c976fb7d3ed
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7864fcaec96d8fea1626dbb9c76b0620fa694b4a
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
Conflicts:
NEWS
Bugs:
https://bugs.php.net/66461
Changed paths:
MM ext/opcache/ZendAccelerator.c
Diff: