com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend.c Zend/zend_API.c Zend/zend_execute_API.c ext/gd/gd.c
ext/opcache/ZendAccelerator.c ext/opcach e/zend_accelerator_util_funcs.c ext/opcache/zend_sh ared_alloc.c ext/pdo/pdo_stmt.c ext/soap/soap.c
ext/standard/file.h ext/standard/string.c main/netwo rk.c
| From: | Anatol Belski | Date: | Fri, 10 Oct 2014 20:51:13 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend.c Zend/zend_API.c Zend/zend_execute_API.c ext/gd/gd.c ext/opcache/ZendAccelerator.c ext/opcach e/zend_accelerator_util_funcs.c ext/opcache/zend_sh ared_alloc.c ext/pdo/pdo_stmt.c ext/soap/soap.c ext/standard/file.h ext/standard/string.c main/netwo rk.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82250@lists.php.net to get a copy of this message | ||
Commit: e1cd0e0a38deb91d24ded68df010b7f6c03d2cb6
Author: Anatol Belski <ab@php.net> Fri, 10 Oct 2014 22:51:13 +0200
Parents: fe42847799c9fab9476ca6399e25ed0da0cb2d5c e33e4b2d8c44fb04afc54f688ed44dce7e8a2e0f
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e1cd0e0a38deb91d24ded68df010b7f6c03d2cb6
Log:
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (40 commits)
int to size_t where the underlaying API supports it
use php_socket_t instead of int
fix signed/unsigned mismatch warning
fix compilation warning
Improved specialisation $this variable accessed through IS_UNUSED operand must be IS_OBJECT, so we
don't have to check for its type or perform dereference.
Add notes about get_class_entry/get_class_name to UPGRADING
Fix casts in GD
Drop redundant casting code from ext/filter
update NEWS
update NEWS
update NEWS
update NEWS
Added note to UPGRADING regarding 64-bit support in pack()/unpack()
pack(): Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG
Add 64 bit formats to pack() and unpack()
Help to CPU branch predictor
Removed unused EG(orig_error_reporting)
Update get_class_name semantics
Remove Z_OBJ_CLASS_NAME_P
Improved VM stack primitives for fast paths. Slow paths are not inlined anymore.
...
Changed paths:
MM Zend/zend.c
MM Zend/zend_API.c
MM Zend/zend_execute_API.c
MM ext/gd/gd.c
MM ext/opcache/ZendAccelerator.c
MM ext/opcache/zend_accelerator_util_funcs.c
MM ext/opcache/zend_shared_alloc.c
MM ext/pdo/pdo_stmt.c
MM ext/soap/soap.c
MM ext/standard/file.h
MM ext/standard/string.c
MM main/network.c
Diff:
diff --cc ext/opcache/zend_accelerator_util_funcs.c
index bae6121,ee7be50...1d949e4
--- a/ext/opcache/zend_accelerator_util_funcs.c
+++ b/ext/opcache/zend_accelerator_util_funcs.c
@@@ -603,9 -606,9 +604,8 @@@ static void zend_class_copy_ctor(zend_c
zend_class_entry *old_ce = ce;
zend_class_entry *new_ce;
zend_function *new_func;
- TSRMLS_FETCH();
- *pce = ce = zend_arena_alloc(&CG(arena), sizeof(zend_class_entry));
- *ce = *old_ce;
+ *pce = ce = ARENA_REALLOC(old_ce);
ce->refcount = 1;
if (old_ce->refcount != 1) {