Merge from GitHub

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index f05798e044443a27adf7db4c18a208dcfe95dcab..76a33206ec90a4f5834e8bc8982fe72364bec48c 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2163,7 +2163,9 @@ static void accel_fast_zval_ptr_dtor(zval **zval_ptr)
                        case IS_CONSTANT_ARRAY: {
                                        TSRMLS_FETCH();
 
+#if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
                                        GC_REMOVE_ZVAL_FROM_BUFFER(zvalue);
+#endif
                                        if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) {
                                                /* break possible cycles */
                                                Z_TYPE_P(zvalue) = IS_NULL;
@@ -2176,7 +2178,9 @@ static void accel_fast_zval_ptr_dtor(zval **zval_ptr)
                                {
                                        TSRMLS_FETCH();
 
+#if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
                                        GC_REMOVE_ZVAL_FROM_BUFFER(zvalue);
+#endif
                                        Z_OBJ_HT_P(zvalue)->del_ref(zvalue TSRMLS_CC);
                                }
                                break;

diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h
index 733e544e1188130d306e2e164c4869e5461780e1..5f414f2bda32e112a30a806d70b32748d500bcbe 100644 (file)
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@ -27,7 +27,7 @@
 #endif
 
 #define ACCELERATOR_PRODUCT_NAME       "Zend OPcache"
-#define ACCELERATOR_VERSION "7.0.2-dev"
+#define ACCELERATOR_VERSION "7.0.3-dev"
 /* 2 - added Profiler support, on 20010712 */
 /* 3 - added support for Optimizer's encoded-only-files mode */
 /* 4 - works with the new Optimizer, that supports the file format with licenses */