summaryrefslogtreecommitdiffstats
path: root/53533cd4dd972087da705550eeb3e41485d9c5be.patch
blob: cb8325827efbff5d476fbc2a16325e6c499638cb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
From 53533cd4dd972087da705550eeb3e41485d9c5be Mon Sep 17 00:00:00 2001
From: Jan-E <github@ehrhardt.nl>
Date: Tue, 13 Jun 2017 18:14:12 +0200
Subject: [PATCH] remove ZEND_ACC_CLONE

---
 v8js_class.cc         | 2 +-
 v8js_object_export.cc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/v8js_class.cc b/v8js_class.cc
index 4c27783..c424f32 100644
--- a/v8js_class.cc
+++ b/v8js_class.cc
@@ -537,7 +537,7 @@ static PHP_METHOD(V8Js, __construct)
 			continue;
 		}
 
-		if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) {
+		if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) != 0) {
 			/* no __construct, __destruct(), or __clone() functions */
 			continue;
 		}
diff --git a/v8js_object_export.cc b/v8js_object_export.cc
index 254e0ed..d733ae2 100644
--- a/v8js_object_export.cc
+++ b/v8js_object_export.cc
@@ -336,7 +336,7 @@ static void v8js_named_property_enumerator(const v8::PropertyCallbackInfo<v8::Ar
 			/* Allow only public methods */
 			continue;
 		}
-		if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) {
+		if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) != 0) {
 			/* no __construct, __destruct(), or __clone() functions */
 			continue;
 		}
@@ -539,7 +539,7 @@ static void v8js_fake_call_impl(const v8::FunctionCallbackInfo<v8::Value>& info)
 
 	if (method_ptr == NULL ||
 		(method_ptr->common.fn_flags & ZEND_ACC_PUBLIC) == 0 ||
-		(method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) {
+		(method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) != 0) {
 		error_len = spprintf(&error, 0,
 			"%s::__call to %s method %s", ce->name,
 			(method_ptr == NULL) ? "undefined" : "non-public", method_name);
@@ -619,7 +619,7 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::String> property
 		 (method_ptr = reinterpret_cast<zend_function *>
 		  (zend_hash_find_ptr(&ce->function_table, method_name))) &&
 		 ((method_ptr->common.fn_flags & ZEND_ACC_PUBLIC) != 0) && /* Allow only public methods */
-		 ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) == 0) /* no __construct, __destruct(), or __clone() functions */
+		 ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) == 0) /* no __construct, __destruct(), or __clone() functions */
 		 ) || (method_ptr=NULL, is_magic_call)
 	) {
 		if (callback_type == V8JS_PROP_GETTER) {