Changeset 66

Timestamp:

04/26/05 22:57:20 (4 years ago)

Author:

zoeloelip

Message:

This patches wasn't included in the last commit:
* Patch 1166707 loader patch for OOP functions in PHP5 (only rapidly tested but also seemed ok to segv)

Files:

• eaccelerator/trunk/loader.c (modified) (5 diffs)

eaccelerator/trunk/loader.c

@@ -3 +3 @@
-   | eAccelerator project                                                 |
-   +----------------------------------------------------------------------+
-eAccelerator       
-sourceforge.net                                
+- 2005 eAccelerator
+net                                                   
-   +----------------------------------------------------------------------+
-   | This program is free software; you can redistribute it and/or        |
@@ -641 +641 @@
-          case RES_CLASS:
-            opline->result.u.var = decode_var(to->T, p, l);
+            opline->result.op_type = IS_CONST;
-            break;
-          case RES_VAR:
@@ -835 +836 @@
-  s = decode_lstr(&len, p, l);
-  if (s != NULL) {
-
+
+
+
-/*???
-      debug_printf("[%d] EACCELERATOR can't restore parent class "
@@ -860 +863 @@
-#endif
-    }
+        efree(r);
-    efree(s);
-  }
@@ -934 +938 @@
-  decode_hash(&to->function_table, sizeof(zend_op_array), (decode_bucket_t)decode_op_array, p, l TSRMLS_CC);
-  to->constants_updated = 0;
+
+#ifdef ZEND_ENGINE_2 /* patch from "Juan M. de la Torre" <juan.torre@iron-gate.net> */
+  {
+    zend_function *f;
+    Bucket *p;
+    int fname_len, cname_len;
+    char *fname_lc, *cname_lc;
+
+    cname_len = to->name_length;
+    cname_lc  = zend_str_tolower_dup(to->name, cname_len);
+
+    to->constructor = to->destructor = to->clone = to->__get = to->__set = to->__call = NULL;
+
+    p = to->function_table.pListHead;
+    while (p != NULL) {
+      f         = p->pData;
+      fname_len = strlen(f->common.function_name);
+      fname_lc  = zend_str_tolower_dup(f->common.function_name, fname_len);
+
+      if (fname_len == cname_len && !memcmp(fname_lc, cname_lc, fname_len))
+        to->constructor = (zend_function*)f;
+      else if (fname_lc[0] == '_' && fname_lc[1] == '_')
+      {
+        if (fname_len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1 && memcmp(fname_lc, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)) == 0) 
+          to->constructor = (zend_function*)f;
+        else if (fname_len == sizeof(ZEND_DESTRUCTOR_FUNC_NAME)-1 && memcmp(fname_lc, ZEND_DESTRUCTOR_FUNC_NAME, sizeof(ZEND_DESTRUCTOR_FUNC_NAME)) == 0)
+          to->destructor = (zend_function*)f;
+        else if (fname_len == sizeof(ZEND_CLONE_FUNC_NAME)-1 && memcmp(fname_lc, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)) == 0)
+          to->clone = (zend_function*)f;
+        else if (fname_len == sizeof(ZEND_GET_FUNC_NAME)-1 && memcmp(fname_lc, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)) == 0)
+          to->__get = (zend_function*)f;
+        else if (fname_len == sizeof(ZEND_SET_FUNC_NAME)-1 && memcmp(fname_lc, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)) == 0)
+          to->__set = (zend_function*)f;
+        else if (fname_len == sizeof(ZEND_CALL_FUNC_NAME)-1 && memcmp(fname_lc, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)) == 0)
+          to->__call = (zend_function*)f;
+      }
+      efree(fname_lc);
+      p = p->pListNext;
+    }
+  }
+#endif
-
-  MMCG(class_entry) = old;