Changeset 17

Timestamp:

12/17/04 23:42:34 (4 years ago)

Author:

everaldo_canuto

Message:

Segv74 patchs for PHP5. New version 0.9.1

Files:

• eaccelerator/trunk/eaccelerator.c (modified) (55 diffs)
• eaccelerator/trunk/eaccelerator_version.h (modified) (1 diff)
• eaccelerator/trunk/optimize.c (modified) (1 diff)

eaccelerator/trunk/eaccelerator.c

@@ -24 +24 @@
-   +----------------------------------------------------------------------+
-   | Author(s): Dmitry Stogov <mmcache@turckware.ru>                      |
+   |            Seung Woo <segv@sayclub.com>                              |
+   |            Everaldo Canuto <everaldo_canuto@yahoo.com.br>            |
-   +----------------------------------------------------------------------+
-   $Id$
@@ -163 +165 @@
-#ifdef ZEND_ENGINE_2
-  zend_uint num_args;
+  zend_uint required_num_args;
-  zend_arg_info *arg_info;
-  zend_bool pass_rest_by_reference;
@@ -169 +172 @@
-#endif
-  char *function_name;
+  char *function_name_lc;
-#ifdef ZEND_ENGINE_2
-  char* scope_name;
@@ -197 +201 @@
-  char type;
-  char *name;
+  char *name_lc;
-  uint name_length;
-  char *parent;
@@ -207 +212 @@
-  HashTable constants_table;
-  zend_uint num_interfaces;
-
+
+
+
+
+
+
+
-  char *filename;
-  zend_uint line_start;
@@ -401 +412 @@
-#include <stdio.h>
-static FILE *F_fp;
+
+static void binary_print(char *p, int len) {
+  while (len--) {
+    fputc(*p++, F_fp);
+  }
+  fputc('\n', F_fp);
+}
+
+static void log_hashkeys(char *p, HashTable *ht)
+{
+  Bucket *b;
+  int i = 0;
+
+  b = ht->pListHead;
+
+  fputs(p, F_fp);
+  while (b) {
+    fprintf(F_fp, "[%d] ", i);
+    binary_print(b->arKey, b->nKeyLength);
+
+    b = b->pListNext;
+    i++;
+  }
+}
-
-static void pad(TSRMLS_D) {
@@ -1234 +1269 @@
-/******************************************************************************/
-
-
+
+
+
+
+
-  if (len > MAX_DUP_STR_LEN || zend_hash_add(&MMCG(strings), str, len, &str, sizeof(char*), NULL) == SUCCESS) {
-    EACCELERATOR_ALIGN(MMCG(mem));
@@ -1368 +1407 @@
-    for (i = 0; i < from->num_args; i++) {
-      if (from->arg_info[i].name) {
-
++1
-      }
-      if (from->arg_info[i].class_name) {
-
++1
-      }
-    }
@@ -1447 +1486 @@
-
-static void calc_class_entry(zend_class_entry* from TSRMLS_DC) {
+  int i;
+
-  if (from->type != ZEND_USER_CLASS) {
-    debug_printf("[%d] EACCELERATOR can't cache internal class \"%s\"\n", getpid(), from->name);
@@ -1467 +1508 @@
-    calc_string(from->parent->name, from->parent->name_length + 1  TSRMLS_CC);
-  }
-
-#ifdef ZEND_ENGINE_2
+#if 0
+  // what's problem. why from->interfaces[i] == 0x5a5a5a5a ?
+  for (i=0; i<from->num_interfaces; i++) {
+    if (from->interfaces[i]) {
+      calc_string(from->interfaces[i]->name, from->interfaces[i]->name_length);
+    }
+  }
+#endif
-  if (from->filename != NULL) {
-    calc_string(from->filename, strlen(from->filename)+1 TSRMLS_CC);
@@ -1722 +1770 @@
-#ifdef DEBUG
-  pad(TSRMLS_C);
-
-
+ [scope=%s]
+, from->scope ? from->scope->name : "NULL"
-  fflush(F_fp);
-#endif
@@ -1742 +1790 @@
-#ifdef ZEND_ENGINE_2
-  to->num_args = from->num_args;
+  to->required_num_args = from->required_num_args;
-  if (from->num_args > 0) {
-    zend_uint i;
@@ -1749 +1798 @@
-    for (i = 0; i < from->num_args; i++) {
-      if (from->arg_info[i].name) {
-
++1
-        to->arg_info[i].name_len = from->arg_info[i].name_len;
-      }
-      if (from->arg_info[i].class_name) {
-
++1
-        to->arg_info[i].class_name_len = from->arg_info[i].class_name_len;
-      }
-      to->arg_info[i].allow_null        = from->arg_info[i].allow_null;
-      to->arg_info[i].pass_by_reference = from->arg_info[i].pass_by_reference;
+      to->arg_info[i].return_reference = from->arg_info[i].return_reference;
-    }
-  }
@@ -1774 +1824 @@
-         */
-        to->function_name = store_string(from->function_name, strlen(from->function_name)+1  TSRMLS_CC);
-
+
+
-  }
-#ifdef ZEND_ENGINE_2
@@ -1790 +1841 @@
-          {
-        to->scope_name = store_string(q->arKey, q->nKeyLength TSRMLS_CC);
-
+
+
+
+
+
-        break;
-      }
-      q = q->pListNext;
+    }
+    if (to->scope_name == NULL)
+    {
+#ifdef DEBUG
+      pad(TSRMLS_C); fprintf(F_fp, "[%d]                 could not find scope '%s' in CG(class_table), saving it to NULL\n", getpid(), from->scope->name ? from->scope->name : "NULL"); fflush(F_fp);
+#endif
-    }
-  }
@@ -1895 +1956 @@
-static eaccelerator_class_entry* store_class_entry(zend_class_entry* from TSRMLS_DC) {
-  eaccelerator_class_entry *to;
+  int i;
-
-  EACCELERATOR_ALIGN(MMCG(mem));
@@ -1907 +1969 @@
-  to->static_members = NULL;
-  to->num_interfaces = from->num_interfaces;
+
+#if 0
+  // i need to check more. why this field is null.
+  //
+  for (i=0; i<from->num_interfaces; i++) {
+    if (from->interfaces[i]) {
+      to->interfaces[i] = store_string(from->interfaces[i]->name, from->interfaces[i]->name_length);
+    }
+  }
+#endif
+
-#endif
-
-#ifdef DEBUG
-  pad(TSRMLS_C);
-\n", getpid(), from->name? from->name : "(top)
+ parent was '%s'\n", getpid(), from->name? from->name : "(top)", from->parent ? from->parent->name : "NULL
-  fflush(F_fp);
-  MMCG(xpad)++;
@@ -1918 +1991 @@
-  if (from->name != NULL) {
-    to->name = store_string(from->name, from->name_length+1 TSRMLS_CC);
-
+
+
-  }
-  if (from->parent != NULL && from->parent->name) {
-    to->parent = store_string(from->parent->name, from->parent->name_length+1 TSRMLS_CC);
-
+
+
-  }
-
@@ -1932 +2007 @@
-*/
-#ifdef ZEND_ENGINE_2
-
-
-
+
+
+
+
+
+
+
+
-  if (from->filename != NULL) {
-    to->filename = store_string(from->filename, strlen(from->filename)+1 TSRMLS_CC);
@@ -1972 +2052 @@
-  char *x;
-
+#ifdef DEBUG
+  pad(TSRMLS_C); fprintf(F_fp, "[%d] eaccelerator_store_int: key='%s'\n", getpid(), key); fflush(F_fp);
+#endif
+
-  MMCG(compress) = 1;
-  zend_hash_init(&MMCG(strings), 0, NULL, NULL, 0);
@@ -1988 +2072 @@
-  q = NULL;
-  while (c != NULL) {
+#ifdef DEBUG
+  pad(TSRMLS_C); fprintf(F_fp, "[%d] eaccelerator_store_int:     class hashkey=", getpid()); binary_print(c->arKey, c->nKeyLength); fflush(F_fp);
+#endif
-    EACCELERATOR_ALIGN(MMCG(mem));
-    fc = (mm_fc_entry*)MMCG(mem);
@@ -2012 +2099 @@
-  q = NULL;
-  while (f != NULL) {
+#ifdef DEBUG
+  pad(TSRMLS_C); fprintf(F_fp, "[%d] eaccelerator_store_int:     function hashkey='%s'\n", getpid(), f->arKey); fflush(F_fp);
+#endif
-    EACCELERATOR_ALIGN(MMCG(mem));
-    fc = (mm_fc_entry*)MMCG(mem);
@@ -2285 +2375 @@
-
-static zend_op_array* restore_op_array(zend_op_array *to, eaccelerator_op_array *from TSRMLS_DC) {
-internal_
+
-
-#ifdef DEBUG
@@ -2310 +2400 @@
-  to->type             = from->type;
-#ifdef ZEND_ENGINE_2
+  /* this is internal function's case
+   * struct zend_internal_function
+        zend_uchar type;
+        char *function_name;            
+        zend_class_entry *scope;
+        zend_uint fn_flags;     
+        union _zend_function *prototype;
+        zend_uint num_args;
+        zend_uint required_num_args;
+        zend_arg_info *arg_info;
+        zend_bool pass_rest_by_reference;
+        unsigned char return_reference;
+    */
+  /*
+   * typedef struct _zend_internal_function {
+   * // Common elements
+   *    zend_uchar type;
+   *    char *function_name;            
+   *    zend_class_entry *scope;
+   *    zend_uint fn_flags;     
+   *    union _zend_function *prototype;
+   *    zend_uint num_args;
+   *    zend_uint required_num_args;
+   *    zend_arg_info *arg_info;
+   *    zend_bool pass_rest_by_reference;
+   *    unsigned char return_reference;
+   * // END of common elements
+   *
+   *    void (*handler)(INTERNAL_FUNCTION_PARAMETERS);
+   * } zend_internal_function;
+   */
-  to->num_args = from->num_args;
+  to->required_num_args      = from->required_num_args;
-  to->arg_info = from->arg_info;
-  to->pass_rest_by_reference = from->pass_rest_by_reference;
@@ -2317 +2439 @@
-#endif
-  to->function_name    = from->function_name;
+
+  int    fname_len;
+  char  *fname_lc;
+
+  if (to->function_name)
+  {
+    fname_len = strlen(to->function_name);
+    fname_lc  = zend_str_tolower_dup(to->function_name, fname_len);
+  }
-#ifdef ZEND_ENGINE_2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (to->scope != NULL)
-        {
-                unsigned int len = strlen(to->function_name);
-                char *lcname = zend_str_tolower_dup(to->function_name, len);
+                char *lc_to_name = zend_str_tolower_dup(to->scope->name, to->scope->name_length);
-                /*
-                 * HOESH: this one probably the old style constructor,
@@ -2351 +2540 @@
-                 */
-
+    /* segv74: I got a question.
+     *
+     *         I think that, this code is reconstructing zend_class_entry thing.
+     *         is it right doing this here?
+     *
+     *         IMHO, we can do this job in restore_class_entry().
+     *         it's not good for readablity, and dosen't have performace gain.
+     */
+#ifdef DEBUG
+  pad(TSRMLS_C);
+  fprintf(F_fp, "        scope: %s[%d], method name: %s[%d] (%d) : to->scope->constructor=0x%08x\n",
+      lcname, to->scope->name_length, lc_to_name, len, memcmp(lc_to_name, lcname, len), to->scope->constructor);
+  fflush(F_fp);
+#endif
-                if  (
-                                to->scope->name_length == len &&
-to->scope->
+lc_to_
-                                (
-                                        to->scope->constructor == NULL || // case 0)
@@ -2362 +2565 @@
-                        )
-                {
+#ifdef DEBUG
+  pad(TSRMLS_C);
+  fprintf(F_fp, "------>    matched\n");
+  fflush(F_fp);
+#endif
-                        to->scope->constructor = (zend_function*)to;
-                }
@@ -2399 +2607 @@
-                }
-                efree(lcname);
+        efree(lc_to_name);
-        }
+#endif
-#endif
-  if (from->type == ZEND_INTERNAL_FUNCTION)
-  {
-        zend_class_entry* ce = MMCG(class_entry);
+#ifdef DEBUG
+    pad(TSRMLS_C); fprintf(F_fp, "[%d]                   [internal function from=%08x,to=%08x] ce='%s' [%08x]\n", getpid(), from, to, ce->name, ce); fflush(F_fp);
+    if (ce)
+    {
+      pad(TSRMLS_C); fprintf(F_fp, "[%d]                                       ce->parent='%s' [%08x]\n", getpid(), ce->parent->name, ce->parent); fflush(F_fp);
+    }
+#endif
-    if (ce != NULL &&
-                ce->parent != NULL &&
-                zend_hash_find(&ce->parent->function_table,
-to->function_name, strlen(to->function_name)
+fname_lc, fname_len
-                        (void **) &function)==SUCCESS &&
-                function->type == ZEND_INTERNAL_FUNCTION)
-        {
-
-
-
-
-
-
+
+
+
+
-    }
-        else
@@ -2425 +2640 @@
-                 * damaged structure...
-                 */
+#ifdef DEBUG
+      pad(TSRMLS_C); fprintf(F_fp, "[%d]                                       can't find\n", getpid()); fflush(F_fp);
+#endif
-    }
-    return to;
@@ -2489 +2707 @@
-{
-  zend_class_entry *old;
+  zend_function     *f;
+  int   fname_len;
+  char *fname_lc;
-
-#ifdef DEBUG
@@ -2513 +2734 @@
-*/
-  to->num_interfaces = from->num_interfaces;
+  //to->num_interfaces = 0;
-  if (to->num_interfaces > 0) {
-    to->interfaces = (zend_class_entry **) emalloc(sizeof(zend_class_entry *)*to->num_interfaces);
-
+
+
+
+
-  } else {
-    to->interfaces = NULL;
-
-
+
+
+
+
+
+
-/*
-  to->create_object = NULL;
@@ -2533 +2762 @@
-  if (from->parent != NULL)
-  {
-
-
+
+
+
+
-        {
-      debug_printf("[%d] EACCELERATOR can't restore parent class "
@@ -2566 +2797 @@
-#endif
-    }
-
+
+
+
+
+
+
+
+
+
+
-  old = MMCG(class_entry);
-  MMCG(class_entry) = to;
@@ -2622 +2862 @@
-  to->function_table.pDestructor = ZEND_FUNCTION_DTOR;
-
+#ifdef ZEND_ENGINE_2
+  int   cname_len = to->name_length;
+  char *cname_lc  = zend_str_tolower_dup(to->name, cname_len);
+
+  Bucket *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;
+  }
+  efree(cname_lc);
+
+#endif
-  MMCG(class_entry) = old;
-
@@ -2669 +2942 @@
-#ifdef ZEND_ENGINE_2
-  ce = restore_class_entry(NULL, (eaccelerator_class_entry *)p->fc TSRMLS_CC);
-
+
+
+
+
+
+
-    if (zend_hash_add(CG(class_table), p->htabkey, p->htablen,
-
-
-
+
+
-    if (zend_hash_add(CG(class_table), p->htabkey, p->htablen,
-
-
+
+
+
-      CG(in_compilation) = 1;
-      CG(compiled_filename) = MMCG(mem);
@@ -2687 +2965 @@
-    }
-  }
+
-}
-
@@ -3051 +3330 @@
-  t = eaccelerator_restore(realname, &buf, &nreloads, compile_time TSRMLS_CC);
-
+// segv74: really cheap work around to auto_global problem.
+//         it makes just in time to every time.
+#ifdef ZEND_ENGINE_2
+  zend_is_auto_global("_GET", sizeof("_SERVER")-1 TSRMLS_CC);
+  zend_is_auto_global("_POST", sizeof("_SERVER")-1 TSRMLS_CC);
+  zend_is_auto_global("_COOKIE", sizeof("_SERVER")-1 TSRMLS_CC);
+  zend_is_auto_global("_SERVER", sizeof("_SERVER")-1 TSRMLS_CC);
+  zend_is_auto_global("_ENV", sizeof("_ENV")-1 TSRMLS_CC);
+  zend_is_auto_global("_REQUEST", sizeof("_REQUEST")-1 TSRMLS_CC);
+  zend_is_auto_global("_FILES", sizeof("_SERVER")-1 TSRMLS_CC);
+#endif
-  if (t != NULL) {
-    if (eaccelerator_debug > 0) {
@@ -3082 +3372 @@
-#if defined(DEBUG)
-    fprintf(F_fp, "[%d] Leave COMPILE\n",getpid()); fflush(F_fp);
+    //dprint_compiler_retval(t, 1);
-#endif
-    return t;
@@ -3090 +3381 @@
-    HashTable* orig_function_table;
-    HashTable* orig_class_table;
+    HashTable* orig_eg_class_table;
-    HashTable tmp_function_table;
-    HashTable tmp_class_table;
@@ -3098 +3390 @@
-#if defined(DEBUG) || defined(TEST_PERFORMANCE)
-    fprintf(F_fp, "\t[%d] compile_file: marking\n",getpid()); fflush(F_fp);
+    if (CG(class_table) != EG(class_table))
+    {
+      fprintf(F_fp, "\t[%d] oops, CG(class_table)[%08x] != EG(class_table)[%08x]\n", getpid(), CG(class_table), EG(class_table));
+      //log_hashkeys("CG(class_table)\n", CG(class_table));
+      //log_hashkeys("EG(class_table)\n", EG(class_table));
+    }
+    else
+      fprintf(F_fp, "\t[%d] OKAY. That what I thought, CG(class_table)[%08x] == EG(class_table)[%08x]\n", getpid(), CG(class_table), EG(class_table));
+      //log_hashkeys("CG(class_table)\n", CG(class_table));
-#endif
-
@@ -3107 +3408 @@
-    zend_hash_init_ex(&tmp_class_table, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
-    zend_hash_copy(&tmp_class_table, &eaccelerator_global_class_table, NULL, &tmp_class, sizeof(zend_class_entry));
+
-    orig_class_table = CG(class_table);;
-    CG(class_table) = &tmp_class_table;
+#ifdef ZEND_ENGINE_2
+    orig_eg_class_table = EG(class_table);;
+    EG(class_table) = &tmp_class_table;
+#endif
-
-    /* Storing global pre-compiled functions and classes */
@@ -3118 +3424 @@
-    fprintf(F_fp, "\t[%d] compile_file: compiling (%ld)\n",getpid(),elapsed_time(&tv_start)); fflush(F_fp);
-#else
-\n",getpid()
+ tmp_class_table=%d class_table=%d\n", getpid(), tmp_class_table.nNumOfElements, orig_class_table->nNumOfElements
-#endif
-#endif
@@ -3131 +3437 @@
-      CG(function_table) = orig_function_table;
-      CG(class_table) = orig_class_table;
+#ifdef ZEND_ENGINE_2
+      EG(class_table) = orig_eg_class_table;
+#endif
-      bailout = 1;
-    } zend_end_try();
@@ -3136 +3445 @@
-      zend_bailout();
-    }
+#if defined(DEBUG)
+    //log_hashkeys("class_table\n", CG(class_table));
+#endif
-
-/*???
@@ -3217 +3529 @@
-    CG(function_table) = orig_function_table;
-    CG(class_table) = orig_class_table;
+#ifdef ZEND_ENGINE_2
+    EG(class_table) = orig_eg_class_table;
+#ifdef DEBUG
+    fprintf(F_fp, "\t[%d] restoring CG(class_table)[%08x] != EG(class_table)[%08x]\n", getpid(), CG(class_table), EG(class_table));
+#endif
+#endif
-    while (function_table_tail != NULL) {
-      zend_op_array *op_array = (zend_op_array*)function_table_tail->pData;
@@ -3288 +3606 @@
-#if defined(DEBUG)
-  fprintf(F_fp, "[%d] Leave COMPILE\n",getpid()); fflush(F_fp);
+  //dprint_compiler_retval(t, 0);
-#endif
-  return t;
@@ -5288 +5607 @@
-  EACCELERATOR_EXTENSION_NAME,
-  EACCELERATOR_VERSION,
- Team
+
-  "http://eaccelerator.sourceforge.net",
- Team
+
-  eaccelerator_zend_startup,
-  NULL,
@@ -5317 +5636 @@
-  EACCELERATOR_EXTENSION_NAME,
-  EACCELERATOR_VERSION,
- Team
+
-  "http://eaccelerator.sourceforge.net",
-5 eAccelerator Team
+4 eAccelerator
-  eaccelerator_zend_startup,
-  NULL,
@@ -5826 +6145 @@
-      if (x->type == ZEND_USER_CLASS) {
-#ifdef ZEND_ENGINE_2
-
+&Horde=22c8f7474b79194f32569fc1af447f5b
-        p->realfilename, class, class);
-        if (x->ce_flags & ZEND_ACC_FINAL_CLASS) {
@@ -5844 +6163 @@
-        ZEND_PUTS("]</td></tr>");
-#else
-
+&Horde=22c8f7474b79194f32569fc1af447f5b
-          p->realfilename, class, class);
-#endif
@@ -5865 +6184 @@
-      if (func[0] == '\000' && fc->htablen > 0) func[0] = '-';
-      if (((zend_function*)(fc->fc))->type == ZEND_USER_FUNCTION) {
-
+&Horde=22c8f7474b79194f32569fc1af447f5b
-          p->realfilename, func, func);
-      } else {
@@ -5984 +6303 @@
-      if (x->type == ZEND_USER_FUNCTION) {
-#ifdef ZEND_ENGINE_2
-
+&Horde=22c8f7474b79194f32569fc1af447f5b
-        if (x->fn_flags & ZEND_ACC_STATIC) {
-          ZEND_PUTS("static ");
@@ -6003 +6322 @@
-        ZEND_PUTS("]</td></tr>");
-#else
-
+&Horde=22c8f7474b79194f32569fc1af447f5b
-#endif
-      } else {
@@ -6569 +6888 @@
-  EACCELERATOR_LOCK_RD();
-  EACCELERATOR_PROTECT();
-
+input type=\"hidden\" name=\"Horde\" value=\"22c8f7474b79194f32569fc1af447f5b\" /><
-  if (MMCG(enabled) && eaccelerator_mm_instance->enabled) {
-    ZEND_PUTS("<input type=\"submit\" name=\"disable\" value=\"Disable\" title=\"Disable caching of PHP scripts\" style=\"width:100px\">\n");
@@ -6622 +6941 @@
-    format_size(s, p->size, 0);
-#ifdef WITH_EACCELERATOR_DISASSEMBLER
-
+&Horde=22c8f7474b79194f32569fc1af447f5b
-      php_self?(*php_self)->value.str.val:"",
-      p->realfilename);

eaccelerator/trunk/eaccelerator_version.h

@@ -1 +1 @@
-#ifndef EACCELERATOR_VERSION
-0
+1
-#endif

eaccelerator/trunk/optimize.c

@@ -261 +261 @@
-             case ZEND_FE_FETCH:
-#ifdef ZEND_ENGINE_2
+             case ZEND_ASSIGN_DIM:
-             case ZEND_DECLARE_CLASS:
-             case ZEND_DECLARE_INHERITED_CLASS: