Changeset 90

Timestamp:

05/10/05 12:56:56 (3 years ago)

Author:

zoeloelip

Message:

This patch adds the right destructor for the propertiesinfo hashtable, but it doesn't fix bug 1179270

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.c (modified) (3 diffs)

eaccelerator/trunk/ChangeLog

@@ -2 +2 @@
-        
-        * Added some includes to satisfy VC.NET (thanks to dakalka, patch 1198522)
+        * This patch adds the right destructor for the propertiesinfo hashtable, but it doesn't fix bug 1179270
-
-2005-05-09 Franck Tabary <franck34 at users.sourceforge.net>

eaccelerator/trunk/eaccelerator.c

@@ -2391 +2391 @@
-}
-
+/* is equal to zend_destroy_property_info in zend_compile.c, this function is 
+ * needed as destructor for the properties_info hashtable, but is declared 
+ * static, so redefine it here. */
+static void destroy_property_info(zend_property_info *property_info) {
+  efree(property_info->name);
+}
+
-static zend_class_entry* restore_class_entry(zend_class_entry* to, eaccelerator_class_entry *from TSRMLS_DC)
-{
@@ -2529 +2536 @@
-  to->default_properties.pDestructor = ZVAL_PTR_DTOR;
-  restore_hash(&to->properties_info, &from->properties_info, (restore_bucket_t)restore_property_info TSRMLS_CC);
-ZVAL_PTR_DTOR
+(dtor_func_t) destroy_property_info
-  if (from->static_members != NULL) {
-    ALLOC_HASHTABLE(to->static_members);
@@ -2540 +2547 @@
-*/
-  }
-/*??? FIXME
-    to->properties_info.pDestructor = (dtor_func_t) zend_destroy_property_info;
-*/
-#else
-  to->refcount = emalloc(sizeof(*to->refcount));