com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS Zend/zend_vm_execute.skl Zend/zend_vm_gen.php
| From: | Xinchen Hui | Date: | Sat, 25 Aug 2012 13:50:08 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS Zend/zend_vm_execute.skl Zend/zend_vm_gen.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69954@lists.php.net to get a copy of this message | ||
Commit: 383eafe482d0e07e6bc8a6b5c1dccb69a9f17bb7
Author: Xinchen Hui <laruence@php.net> Sat, 25 Aug 2012 21:49:29 +0800
Parents: 4c83ecc75452a23799c39f9bbb95b617fa46bf84 d92a89fe52e89eef9527d1e27b5bb051ae24bc54
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=383eafe482d0e07e6bc8a6b5c1dccb69a9f17bb7
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM NEWS
MM Zend/zend_vm_execute.skl
MM Zend/zend_vm_gen.php
Diff:
diff --cc NEWS
index 5e482d2,69cbb2a..b7753d6
--- a/NEWS
+++ b/NEWS
@@@ -1,30 -1,22 +1,31 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2012, PHP 5.3.16
+?? ??? 2012, PHP 5.4.7
- Core:
+ . Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
- . Fixed bug #62763 (register_shutdown_function and extending class).
+ . Fixed bug #62844 (parse_url() does not recognize //). (Andrew Faulds).
+ . Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not
+ set).. (Felipe)
+ . Fixed bug #62763 (register_shutdown_function and extending class).
(Laruence)
+ . Fixed bug #62725 (Calling exit() in a shutdown function does not return
+ the exit value). (Laruence)
. Fixed bug #62744 (dangling pointers made by zend_disable_class). (Laruence)
- . Fixed bug #62716 (munmap() is called with the incorrect length).
+ . Fixed bug #62716 (munmap() is called with the incorrect length)..
(slangley@google.com)
- . Fixed bug ##62460 (php binaries installed as binary.dSYM). (Reeze Xia)
- . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
- with run-test.php). (Laruence)
+ . Fixed bug #62358 (Segfault when using traits a lot). (Laruence)
+ . Fixed bug #62328 (implementing __toString and a cast to string fails)
+ (Laruence)
+ . Fixed bug #51363 (Fatal error raised by var_export() not caught by error
+ handler). (Lonny Kapelushnik)
+ .. Fixed bug #40459 (Stat and Dir stream wrapper methods do not call
+ constructor). (Stas)
- CURL:
+ . Fixed bug #62912 (CURLINFO_PRIMARY_* AND CURLINFO_LOCAL_* not exposed).
+ (Pierrick)
. Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick)
- . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
- (r.hampartsumyan@gmail.com, Laruence)
- DateTime:
. Fixed bug #62852 (Unserialize invalid DateTime causes crash).
diff --cc Zend/zend_vm_execute.skl
index 426f689,e5a143e..6d1b2e7
--- a/Zend/zend_vm_execute.skl
+++ b/Zend/zend_vm_execute.skl
@@@ -2,11 -2,10 +2,11 @@@
ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
{
+ DCL_OPLINE
zend_execute_data *execute_data;
zend_bool nested = 0;
- zend_bool original_in_execution = EG(in_execution);
{%HELPER_VARS%}
+ {%EXECUTION_STATUS%}
{%INTERNAL_LABELS%}