diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2014-10-26 16:58:45 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2014-10-26 16:58:45 -0700 |
| commit | 8d84b1f67adb71bdb2394b62faad04b22f6226f3 (patch) | |
| tree | 0c1c1ed2aaef8eee971575eb5e336631295f4951 /Zend/zend_variables.c | |
| parent | fb85d0322d39d49f37e32df6f68c9769f2cce0e4 (diff) | |
| parent | 09da8952d0434b53e740ffaca66a8051cd39cf93 (diff) | |
| download | php-git-8d84b1f67adb71bdb2394b62faad04b22f6226f3.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (240 commits)
Do not execute anything after quit or clean command
Fix last commit, and do not output unnecessary information
Stabilize execution, always run destructors and extended file breakpoints
Fix nullptr dereference in clean without exec context
remove dodgy param parser, bring userland breakpoint api inline with PHP7
disable output buffering by default
Add question to reset execution in run/exec/clean
- Updated to version 2014.9 (2014i)
actually remove this
disable output buffering, better breakpoint api for userland, remove hand parsing of params
Fix phpdbg output when outputting via php with active output handlers
Fixed Closure::call() NEWS/UPGRADING
Set engine back to initial state after fatal-ed ev command
Fix eventual stack overflow after clean cmd
Fix listing of files with no absolute path
updated libmagic.patch in master
updated libmagic.patch in 5.6
updated libmagic.patch in 5.5
NEWS
NEWS
...
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 3e68a38487..aae8465791 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -221,7 +221,7 @@ ZEND_API void zval_add_ref_unref(zval *p) { if (Z_REFCOUNTED_P(p)) { if (Z_ISREF_P(p)) { - ZVAL_DUP(p, Z_REFVAL_P(p)); + ZVAL_COPY(p, Z_REFVAL_P(p)); } else { Z_ADDREF_P(p); } @@ -266,7 +266,7 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) } -ZEND_API int zend_print_variable(zval *var TSRMLS_DC) +ZEND_API size_t zend_print_variable(zval *var TSRMLS_DC) { return zend_print_zval(var, 0 TSRMLS_CC); } |