Changeset 299

Timestamp:

02/15/07 17:04:24 (1 year ago)

Author:

bart

Message:

Kick out the old filter implementation and use one based on fnmatch, this
breaks windows support. The plan is to include a bsd licensed fnmatch
implementation when a platform doesn't provide fnmatch. (read: when windows is
being used). Until some steps up to do this or we run into a machine with
windows and VC windows support wil be b0rked.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.c (modified) (7 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (2 diffs)

eaccelerator/trunk/ChangeLog

@@ -1 +1 @@
-2007-02-15  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-
-
-
+
+
+
+
+
+
-
-2007-02-13  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/eaccelerator.c

@@ -49 +49 @@
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <fnmatch.h>
-#ifdef ZEND_WIN32
-#  include "win32/time.h"
@@ -894 +895 @@
-}
-
-/*
- * Only files matching user specified conditions should be cached.
- *
- * TODO - check the algorithm (fl)
- */
-static int match(const char* name, const char* pat) {
-  char p,k;
-  int ok, neg;
-  
-  while (1) {
-    p = *pat++;
-    if (p == '\0') {
-      return (*name == '\0');
-    } else if (p == '*') {
-      if (*pat == '\0') {
-        return 1;
-      }
-      do {
-        if (match(name, pat)) {
-          return 1;
-        }
-      } while (*name++ != '\0');
-      return 0;
-    } else if (p == '?') {
-      if (*name++ == '\0') {
-        return 0;
-      }
-    } else if (p == '[') {
-      ok = 0;
-      if ((k = *name++) == '\0') {
-        return 0;
-      }
-      if ((neg = (*pat == '!')) != '\0') {
-        ++pat;
-      }
-      while ((p = *pat++) != ']') {
-        if (*pat == '-') {
-          if (p <= k && k <= pat[1]) {
-            ok = 1;
-          }
-          pat += 2;
-        } else {
-          if (p == '\\') {
-            p = *pat++;
-            if (p == '\0') {
-              p ='\\';
-              pat--;
-            }
-          }
-          if (p == k) {
-            ok = 1;
-          }
-        }
-      }
-      if (ok == neg) {
-        return 0;
-      }
-    } else {
-      if (p == '\\') {
-        p = *pat++;
-        if (p == '\0') {
-          p ='\\';
-          pat--;
-        }
-      }
-      if (*name++ != p) {
-        return 0;
-      }
-    }
-  }
-  return (*name == '\0');
-}
-
-/* Check if the file is ok to cache */
-static int eaccelerator_ok_to_cache(char *realname TSRMLS_DC) {
-  ea_cond_entry *p;
-  int ok;
-  if (EAG(cond_list) == NULL) {
-    return 1;
-  }
-
-  /* if "realname" matches to any pattern started with "!" then ignore it */
-  for (p = EAG(cond_list); p != NULL; p = p->next) {
-    if (p->not && match(realname, p->str)) {
-      return 0;
-    }
-  }
-
-  /* else if it matches to any pattern not started with "!" then accept it */
-  ok = 1;
-  for (p = EAG(cond_list); p != NULL; p = p->next) {
-    if (!p->not) {
-      ok = 0;
-      if (match(realname, p->str)) {
-        return 1;
-      }
-    }
-  }
-  return ok;
-}
-
-static int eaccelerator_stat(zend_file_handle *file_handle,
@@ -1157 +1058 @@
-}
-
+static int ea_match(struct ea_pattern_t *list, const char *path)
+{
+        struct ea_pattern_t *p;
+        char result, positive;
+
+        // apply all patterns
+        //  - when not patterns are given, *accept*
+        //  - when a pattern with a ! matches, *reject*
+        //  - when no negative pattern matches and a positive pattern match, *accept*
+        //  - when no negative pattern matches and there are no possitive patterns, *accept*
+        //  - *reject*
+
+        if (list == NULL) {
+                // there are no patterns, accept
+                return 1;
+        }
+
+        result = 0; // there are patterns, so if no positive pattern matches, reject
+        positive = 0;
+        p = list;
+        while (p != NULL) {
+                if (p->pattern[0] == '!') {
+                  if ((fnmatch((const char *)(p->pattern + 1), path, 0) == 0)) {
+                                // a negative pattern matches, accept
+                                return 0;
+                        }
+                } else {
+                        result |= (fnmatch((const char *)p->pattern, path, 0) == 0);
+                        positive = 1;
+                }
+                p = p->next;
+        }
+
+  return result | !positive;
+}
+
-/*
- * Intercept compilation of PHP file.  If we already have the file in
@@ -1193 +1130 @@
-  }
-
-ccelerator_ok_to_cache(file_handle->filename TSRMLS_CC
+_match(EAG(pattern_list), file_handle->filename
- 
-  // eAccelerator isn't working, so just compile the file
@@ -1521 +1458 @@
-}
-
+/* 
+ * Parse a list of filters which is seperated by a " "
+ */
+static struct ea_pattern_t *ea_parse_filter(char *filter)
+{
+        char *saveptr, *token;
+        struct ea_pattern_t *list_head, *p;
+        size_t len;
+
+        // tokenize the filter string on a space
+        list_head = NULL;
+        p = NULL;
+        while ((token = strtok_r(filter, " ", &saveptr)) != NULL) {
+                filter = NULL;
+                list_head = malloc(sizeof(struct ea_pattern_t));
+                memset(list_head, 0, sizeof(struct ea_pattern_t));
+
+                len = strlen(token);
+                list_head->pattern = malloc(len + 1);
+                strncpy(list_head->pattern, token, len + 1); 
+                list_head->next = p;
+                p = list_head;
+        }
+
+        return list_head;
+}
+
-/******************************************************************************/
-/*
@@ -1529 +1493 @@
- */
-PHP_INI_MH(eaccelerator_filter) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  return SUCCESS;
-}
@@ -1774 +1700 @@
-#endif
-
-ccelerator_globals
+g
-{
-
-
-
-
-
-
-
+
+
+
+
+
+
-#ifdef WITH_EACCELERATOR_SESSIONS
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-{
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-

eaccelerator/trunk/eaccelerator.h

@@ -428 +428 @@
-#endif
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-/*
@@ -461 +456 @@
-HashTable restored;
-zend_class_entry *class_entry;
-ea_cond_entry *cond_list;
-zend_uint refcount_helper;
-char hostname[32];
+struct ea_pattern_t *pattern_list;
-#ifdef WITH_EACCELERATOR_CRASH_DETECTION
-#ifdef SIGSEGV