Changeset 271

Timestamp:

09/15/06 17:01:01 (4 years ago)

Author:

bart

Message:

Only put the function that has the same name as the class as contructor

if there isn't a construct function. This fixes ticket #172

Location:

eaccelerator

Files:

• branches/0.9.5/ChangeLog (modified) (1 diff)
• branches/0.9.5/ea_restore.c (modified) (2 diffs)
• trunk/ChangeLog (modified) (1 diff)
• trunk/ea_restore.c (modified) (2 diffs)

eaccelerator/branches/0.9.5/ChangeLog

@@ -5 +5 @@
         * Some fixes to make eAccelerator compile with php 5.2, this fixes bug #150
         * Restore __toString methods correctly with php 5.2
+        * only put the function that has the same name as the class as contructor 
+          if there isn't a __construct function. This fixes ticket #172
 
 2006-08-29  Hans Rakers <hans at parse dot nl>

eaccelerator/branches/0.9.5/ea_restore.c

@@ -759 +759 @@
         Bucket *p = to->function_table.pListHead;
 
+    to->constructor = NULL;
+
         while (p != NULL) {
                 f = p->pData;
@@ -764 +766 @@
                 fname_lc = zend_str_tolower_dup(f->common.function_name, fname_len);
                 
-                if (fname_len == cname_len && !memcmp(fname_lc, cname_lc, fname_len) && f->common.scope != to->parent) {
+        /* only put the function that has the same name as the class as contructor if there isn't a __construct function */
+                if (fname_len == cname_len && !memcmp(fname_lc, cname_lc, fname_len) && f->common.scope != to->parent
+                && to->constructor == NULL) {
                         to->constructor = f;
                 } else if (fname_lc[0] == '_' && fname_lc[1] == '_' && f->common.scope != to->parent) {

eaccelerator/trunk/ChangeLog

@@ -3 +3 @@
         * Reverse changeset 205 (doc-comment exclusion) from Tom Regner 
           <t.regner at librics.de>. 
+        * only put the function that has the same name as the class as contructor 
+          if there isn't a __construct function. This fixes ticket #172
 
 2006-08-29  Hans Rakers <hans at parse dot nl>

eaccelerator/trunk/ea_restore.c

@@ -722 +722 @@
         Bucket *p = to->function_table.pListHead;
 
+    to->constructor = NULL;
+
         while (p != NULL) {
                 f = p->pData;
@@ -727 +729 @@
                 fname_lc = zend_str_tolower_dup(f->common.function_name, fname_len);
                 
-                if (fname_len == cname_len && !memcmp(fname_lc, cname_lc, fname_len) && f->common.scope != to->parent) {
+        /* only put the function that has the same name as the class as contructor if there isn't a __construct function */
+                if (fname_len == cname_len && !memcmp(fname_lc, cname_lc, fname_len) && f->common.scope != to->parent
+                && to->constructor == NULL) {
                         to->constructor = f;
                 } else if (fname_lc[0] == '_' && fname_lc[1] == '_' && f->common.scope != to->parent) {