Changeset 86

Timestamp:

07/08/2006 12:44:27 AM (2 years ago)

Author:

moo

Message:

fixes #14, #17, #18

Files:

• branches/1.0/xcache.c (modified) (1 diff)
• trunk/xcache.c (modified) (3 diffs)

branches/1.0/xcache.c

@@ -669 +669 @@
     }
 
+    filename = h->opened_path ? h->opened_path : h->filename;
+    if (xce.name.str.val != filename) {
+        xce.name.str.val = filename;
+        xce.name.str.len = strlen(filename);
+    }
+
 #ifdef HAVE_XCACHE_OPTIMIZER
     if (XG(optimizer)) {

trunk/xcache.c

@@ -630 +630 @@
     }
 
-    if (php_check_open_basedir(filename TSRMLS_CC) != 0) {
-        return NULL;
-    }
-
     stored_xce = NULL;
     op_array = NULL;
@@ -693 +689 @@
     }
 
+    filename = h->opened_path ? h->opened_path : h->filename;
+    if (xce.name.str.val != filename) {
+        xce.name.str.val = filename;
+        xce.name.str.len = strlen(filename);
+    }
+
 #ifdef HAVE_XCACHE_OPTIMIZER
     if (XG(optimizer)) {
@@ -780 +782 @@
 
 restore:
+    if (php_check_open_basedir(stored_xce->name.str.val TSRMLS_CC) != 0) {
+        return NULL;
+    }
+
 #ifdef DEBUG
     fprintf(stderr, "restoring\n");