Changeset 595

Timestamp:

2009-07-05T06:53:27+02:00 (4 years ago)

Author:

moo

Message:

merged r317 from trunk: cacher fix stat and skip user stream

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xcache.c (modified) (10 diffs)

branches/1.3/xcache.c

@@ -651 +651 @@
         if (VCWD_STAT(filepath, pbuf) == 0) {
             free_alloca(paths);
-            return 0;
+            return SUCCESS;
         }
     }
@@ -657 +657 @@
     free_alloca(paths);
 
-    return 1;
+    return FAILURE;
 }
 /* }}} */
@@ -703 +703 @@
 
     if (!filename || !SG(request_info).path_translated) {
-        return 0;
+        return FAILURE;
+    }
+
+    if (strstr(filename, "://") != NULL) {
+        return FAILURE;
     }
 
@@ -721 +725 @@
         if (IS_ABSOLUTE_PATH(filename, strlen(filename))) {
             if (VCWD_STAT(filename, pbuf) != 0) {
-                return 0;
+                return FAILURE;
             }
             goto stat_done;
@@ -737 +741 @@
 
             if (VCWD_STAT(filename, pbuf) != 0) {
-                return 0;
+                return FAILURE;
             }
             goto stat_done;
@@ -744 +748 @@
 
         /* use include_path */
-        if (xc_stat(filename, PG(include_path), pbuf TSRMLS_CC) != 0) {   
-            return 0;
+        if (xc_stat(filename, PG(include_path), pbuf TSRMLS_CC) != SUCCESS) {
+            return FAILURE;
         }
 
@@ -753 +757 @@
         delta = XG(request_time) - pbuf->st_mtime;
         if (abs(delta) < 2 && !xc_test) {
-            return 0;
+            return FAILURE;
         }
 
@@ -779 +783 @@
         filename = expand_filepath(filename, opened_path_buffer TSRMLS_CC);
         if (filename == NULL) {
-            return 0;
+            return FAILURE;
         }
     }
@@ -793 +797 @@
 
     xce->type = XC_TYPE_PHP;
-    return 1;
+    return SUCCESS;
+}
+/* }}} */
+static inline xc_hash_value_t xc_php_hash_md5(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */
+{
+    return HASH_STR_S(php->md5, sizeof(php->md5));
 }
 /* }}} */
@@ -866 +875 @@
     filename = h->opened_path ? h->opened_path : h->filename;
     xce.data.php = &php;
-    if (!xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC)) {
+    if (xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC) != SUCCESS) {
         return old_compile_file(h, type TSRMLS_CC);
     }