summaryrefslogtreecommitdiff
path: root/processor
diff options
context:
space:
mode:
authorXuefer <xuefer@gmail.com>2014-05-28 16:04:58 +0000
committerXuefer <xuefer@gmail.com>2014-05-28 16:04:58 +0000
commit9c0999b7def4b38d82cf913390cd29c7619dacc5 (patch)
tree9410fa1bc117e8ac5c2f5091b3d17ac4d138fe5b /processor
parent71137b9c29f1c1eb9a4f53d012e8548611f8e0d6 (diff)
downloadxcache-9c0999b7def4b38d82cf913390cd29c7619dacc5.tar.gz
xcache-9c0999b7def4b38d82cf913390cd29c7619dacc5.zip
cacher: PHP_5_6: fix support for __debugInfo
git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1490 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
Diffstat (limited to 'processor')
-rw-r--r--processor/head.m43
-rw-r--r--processor/processor.m48
2 files changed, 7 insertions, 4 deletions
diff --git a/processor/head.m4 b/processor/head.m4
index 868b7a9..b42d7c0 100644
--- a/processor/head.m4
+++ b/processor/head.m4
@@ -314,6 +314,9 @@ static void xc_fix_method(xc_processor_t *processor, zend_op_array *dst TSRMLS_D
#if defined(ZEND_ENGINE_2_2) || PHP_MAJOR_VERSION >= 6
SET_IF_SAME_NAME(__tostring);
#endif
+#if defined(ZEND_ENGINE_2_6)
+ SET_IF_SAME_NAME(__debugInfo);
+#endif
')
#ifdef IS_UNICODE
if (UG(unicode)) {
diff --git a/processor/processor.m4 b/processor/processor.m4
index 8cdac41..e5898bc 100644
--- a/processor/processor.m4
+++ b/processor/processor.m4
@@ -549,16 +549,16 @@ DEF_STRUCT_P_FUNC(`zend_class_entry', , `dnl {{{
PROCESS_CTEXTPOINTER(__unset)
PROCESS_CTEXTPOINTER(__isset)
# endif
+ PROCESS_CTEXTPOINTER(__call)
+# ifdef ZEND_CALLSTATIC_FUNC_NAME
+ PROCESS_CTEXTPOINTER(__callstatic)
+# endif
# if defined(ZEND_ENGINE_2_2) || PHP_MAJOR_VERSION >= 6
PROCESS_CTEXTPOINTER(__tostring)
# endif
# if defined(ZEND_ENGINE_2_6)
PROCESS_CTEXTPOINTER(__debugInfo)
# endif
- PROCESS_CTEXTPOINTER(__call)
-# ifdef ZEND_CALLSTATIC_FUNC_NAME
- PROCESS_CTEXTPOINTER(__callstatic)
-# endif
# ifndef ZEND_ENGINE_2_4
/* # NOT DONE */
PROCESS_CTEXTPOINTER(module)