Patch bug_55754_minimal.patch for Scripting Engine problem Bug #55754

Patch version 2011-09-23 18:45 UTC

Obsolete patches:

• bug_55754-php5.3-201109231430.patch, revision 2011-09-23 15:54 UTC
• bug_55754-php5.4-201109231430.patch, revision 2011-09-23 15:55 UTC

• 2011-09-23 18:45 UTC [diff to current]

Developer: dk@uw.no

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index c325a7e..d361c64 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2096,7 +2096,7 @@ void zend_do_pass_param(znode *param, zend_uchar op, int offset TSRMLS_DC) /* {{
 
 	if (function_ptr) {
 		if (ARG_MAY_BE_SENT_BY_REF(function_ptr, (zend_uint) offset)) {
-			if (param->op_type & (IS_VAR|IS_CV)) {
+			if (param->op_type & (IS_VAR|IS_CV) && original_op != ZEND_SEND_VAL) {
 				send_by_reference = 1;
 				if (op == ZEND_SEND_VAR && zend_is_function_or_method_call(param)) {
 					/* Method call */