com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Nikita Popov | Date: | Tue, 14 Apr 2015 14:36:36 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86230@lists.php.net to get a copy of this message | ||
Commit: ed7e6d4758b8a8999b5e29e144e394782d473654
Author: Nikita Popov <nikic@php.net> Tue, 14 Apr 2015 16:36:09 +0200
Parents: e8fb5201ba204cc59104db49f45737385abe139e 95650d0942c99db8c247797d2ce708a586298ae9
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed7e6d4758b8a8999b5e29e144e394782d473654
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM NEWS
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
Diff:
diff --cc NEWS
index 70e74d9,a71c3fc..9c90f3c
--- a/NEWS
+++ b/NEWS
@@@ -9,7 -9,15 +9,9 @@@ PH
. Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer).
(Dmitry)
. Fixed bug #68652 (segmentation fault in destructor). (Dmitry)
+ . Fixed bug #69419 (Returning compatible sub generator produces a warning).
+ (Nikita)
-- 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)