com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_opcode.c
| From: | Dmitry Stogov | Date: | Mon, 06 Apr 2015 15:16:08 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_opcode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86104@lists.php.net to get a copy of this message | ||
Commit: 812106d0c6c067e6ace2e6f241ae3ebcdd27e9c9
Author: Dmitry Stogov <dmitry@zend.com> Mon, 6 Apr 2015 18:16:08 +0300
Parents: 6a7a03644a2680946d4fbba306b87fda7990c811 21bb33cc723c0745cd440d74c375b6e86f20a92c
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=812106d0c6c067e6ace2e6f241ae3ebcdd27e9c9
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68652 (segmentation fault in destructor)
Conflicts:
NEWS
Bugs:
https://bugs.php.net/68652
Changed paths:
MM NEWS
MM Zend/zend_opcode.c
Diff:
diff --cc NEWS
index fe6100b,3e5dcce..793dbae
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,16 +1,10 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015, PHP 5.5.25
+?? May 2015, PHP 5.6.9
+ - Core:
+ . Fixed bug #68652 (segmentation fault in destructor). (Dmitry)
+
-- cURL:
- . Fixed bug #68739 (Missing break / control flow). (Laruence)
-
-- Ereg:
- . Fixed bug #68740 (NULL Pointer Dereference). (Laruence)
-
- ODBC:
. Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0).
(Anatol)