Changeset 160 for branches/1.0/xcache.c

Timestamp:

2006-09-13T02:48:01+02:00 (7 years ago)

Author:

moo

Message:

fix for win32

File:

• branches/1.0/xcache.c (modified) (5 diffs)

branches/1.0/xcache.c

@@ -504 +504 @@
 }
 /* }}} */
-static int xc_entry_init_key_php(xc_entry_t *xce, char *filename TSRMLS_DC) /* {{{ */
+static int xc_entry_init_key_php(xc_entry_t *xce, char *filename, char *opened_path_buffer TSRMLS_DC) /* {{{ */
 {
     struct stat buf, *pbuf;
@@ -540 +540 @@
         return 0;
     }
+
+#ifndef HAVE_INODE
+    /* hash on filename, let's expand it to real path */
+    filename = expand_filepath(filename, opened_path_buffer TSRMLS_CC);
+    if (filename == NULL) {
+        return 0;
+    }
+#endif
 
     UNISW(NOTHING, xce->name_type = IS_STRING;)
@@ -574 +582 @@
     zend_bool catched = 0;
     char *filename;
+    char opened_path_buffer[MAXPATHLEN];
 
     if (!xc_initized) {
@@ -598 +607 @@
     filename = h->opened_path ? h->opened_path : h->filename;
     xce.data.php = &php;
-    if (!xc_entry_init_key_php(&xce, filename TSRMLS_CC)) {
+    if (!xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC)) {
         return origin_compile_file(h, type TSRMLS_CC);
     }
@@ -670 +679 @@
 
     filename = h->opened_path ? h->opened_path : h->filename;
+#ifdef HAVE_INODE
     if (xce.name.str.val != filename) {
         xce.name.str.val = filename;
         xce.name.str.len = strlen(filename);
     }
+#endif
 
 #ifdef HAVE_XCACHE_OPTIMIZER