Changeset 209

Timestamp:

05/08/06 15:17:02 (2 years ago)

Author:

bart

Message:

Changed the filter logic a bit, this fixes bug #72

Files:

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

eaccelerator/trunk/ChangeLog

@@ -3 +3 @@
-        * Make the disassembler do openbasedir checks before showing a file, 
-          this fixes bug #59
+        * Changed the filter logic a bit, this fixes bug #72
-
-2006-05-07  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/eaccelerator.c

@@ -960 +960 @@
-  char p,k;
-  int ok, neg;
-
+
-  while (1) {
-    p = *pat++;
@@ -1029 +1029 @@
-  mm_cond_entry *p;
-  int ok;
-
+
-  if (EAG(cond_list) == NULL) {
-    return 1;
@@ -1252 +1252 @@
-  struct timeval tv_start;
-#endif
+  int ok_to_cache = 0;
-
-#ifdef EACCELERATOR_USE_INODE
@@ -1269 +1270 @@
-        ea_debug_log("EACCELERATOR: Warning: \"%s\" is cached but it's mtime is in the future.\n", file_handle->filename);
-  }
-
-
+
+
+
+
+
-      !eaccelerator_mm_instance->enabled || file_handle == NULL ||
-
-
-
-
-
-
+
-    DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] compile_file: compiling\n", getpid()));
-    t = mm_saved_zend_compile_file(file_handle, type TSRMLS_CC);
@@ -1307 +1306 @@
-  zend_is_auto_global("_FILES", sizeof("_FILES")-1 TSRMLS_CC);
-#endif
-
+
+
-#ifdef DEBUG
-    ea_debug_log("[%d] EACCELERATOR hit: \"%s\"\n", getpid(), t->filename);
@@ -1313 +1313 @@
-    ea_debug_log("EACCELERATOR hit: \"%s\"\n", t->filename);
-#endif
-    /* restored from cache */
-
-    zend_llist_add_element(&CG(open_files), file_handle);
@@ -1338 +1337 @@
-    DBG(ea_debug_printf, (EA_DEBUG, "[%d] Leave COMPILE\n", getpid()));
-    return t;
-
-
+
-    Bucket *function_table_tail;
-    Bucket *class_table_tail;
@@ -1352 +1350 @@
-
-    DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] compile_file: marking\n", getpid()));
-
-{
-      DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] oops, CG(class_table)[%08x] != EG(class_table)[%08x]\n", 
+ {
+  DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] oops, CG(class_table)[%08x] != EG(class_table)[%08x]\n", 
+                                               
-      DBG(ea_debug_log_hashkeys, ("CG(class_table)\n", CG(class_table)));
-      DBG(ea_debug_log_hashkeys, ("EG(class_table)\n", EG(class_table)));
-
-else {
-      DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] OKAY. That what I thought, CG(class_table)[%08x] == EG(class_table)[%08x]\n", 
+ else {
+  DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] OKAY. That what I thought, CG(class_table)[%08x] == EG(class_table)[%08x]\n", 
+                                               
-      DBG(ea_debug_log_hashkeys, ("CG(class_table)\n", CG(class_table)));
-    }
@@ -1384 +1382 @@
-    DBG(ea_debug_printf, (EA_TEST_PERFORMANCE, "\t[%d] compile_file: compiling (%ld)\n",getpid(),ea_debug_elapsed_time(&tv_start)));
-    DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] compile_file: compiling tmp_class_table=%d class_table=%d\n", 
-
+  
-    if (EAG(optimizer_enabled) && eaccelerator_mm_instance->optimizer_enabled) {
-      EAG(compiler) = 1;
@@ -1411 +1409 @@
-*/
-    EAG(compiler) = 0;
-
-
-
-
-
+
-         ((stat(file_handle->opened_path, &buf) == 0) && S_ISREG(buf.st_mode)))) {
-#endif
-      DBG(ea_debug_printf, (EA_TEST_PERFORMANCE, "\t[%d] compile_file: storing in cache (%ld)\n", getpid(), ea_debug_elapsed_time(&tv_start)));
-      DBG(ea_debug_printf, (EA_DEBUG, "\t[%d] compile_file: storing in cache\n", getpid()));
@@ -1466 +1459 @@
-      }
-#endif
-
-
-
-
-
-
+
+
+
-#ifdef DEBUG
-
-
-
-
-
+
+
+
-#endif
-      } else {
@@ -1487 +1475 @@
-      }
-    } else {
-
-
-
-
+
+
-    }
-    CG(function_table) = orig_function_table;
@@ -1496 +1482 @@
-#ifdef ZEND_ENGINE_2
-    EG(class_table) = orig_eg_class_table;
-
+
+
-#endif
-    while (function_table_tail != NULL) {
-      zend_op_array *op_array = (zend_op_array*)function_table_tail->pData;
-      if (op_array->type == ZEND_USER_FUNCTION) {
-
-
-
-
-
+
+
-          CG(in_compilation) = 1;
-          CG(compiled_filename) = file_handle->opened_path;
@@ -1522 +1506 @@
-      zend_class_entry **ce = (zend_class_entry**)class_table_tail->pData;
-      if ((*ce)->type == ZEND_USER_CLASS) {
-
-
-
-
-
+
+
-          CG(in_compilation) = 1;
-          CG(compiled_filename) = file_handle->opened_path;
@@ -1534 +1515 @@
-      if (ce->type == ZEND_USER_CLASS) {
-        if (ce->parent != NULL) {
-
-
+
-            ce->parent = NULL;
-          }
-        }
-
-
-
-
-
+
+
-          CG(in_compilation) = 1;
-          CG(compiled_filename) = file_handle->opened_path;
@@ -2665 +2642 @@
-
-#endif  /* #ifdef HAVE_EACCELERATOR */
+
+/*
+ * Local variables:
+ * tab-width: 2
+ * c-basic-offset: 2
+ * End:
+ * vim600: noet sw=2 ts=2 fdm=marker
+ * vim<600: noet sw=2 ts=2
+ */