[Pkg-php-commits] [php/debian-experimental] Cherry-pick fix for upstream bug #50394

[Raphael Geissert]

---
 .../patches/ref-converted-to-value-in-_call.patch  |   18 ++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/ref-converted-to-value-in-_call.patch

diff --git a/debian/patches/ref-converted-to-value-in-_call.patch b/debian/patches/ref-converted-to-value-in-_call.patch
new file mode 100644
index 0000000..7dc5395
--- /dev/null
+++ b/debian/patches/ref-converted-to-value-in-_call.patch
@@ -0,0 +1,18 @@
+Description: Fix a regression where reference arguments are converted to
+ value in __call.
+Origin: upstream, http://svn.php.net/viewvc?view=revision&revision=292295
+Bug: http://bugs.php.net/50394
+Last-Update: 2010-01-19
+
+Index: php/Zend/zend_execute_API.c
+===================================================================
+--- php.orig/Zend/zend_execute_API.c
++++ php/Zend/zend_execute_API.c
+@@ -838,6 +838,7 @@ int zend_call_function(zend_fcall_info *
+ 		zval *param;
+ 
+         	if(EX(function_state).function->type == ZEND_INTERNAL_FUNCTION 
++			&& (EX(function_state).function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0
+ 			&& !ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 1)
+ 			&& PZVAL_IS_REF(*fci->params[i])) {
+ 			SEPARATE_ZVAL(fci->params[i]);
diff --git a/debian/patches/series b/debian/patches/series
index f1b2cf4..41a7214 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,3 +35,4 @@ mssql-null-exception.patch
 sybase-alias.patch
 strcmp_null-OnUpdateErrorLog.patch
 #deprecate_short_open_tag
+ref-converted-to-value-in-_call.patch
-- 
1.6.3.3