Changeset 966

Timestamp:

11/23/08 16:50:33 (3 years ago)

Author:

bogdan2412

Message:

Some cache fixes. Added update-mimetypes script from live.

Location:

trunk

Files:

• common/cache.php (modified) (3 diffs)
• scripts/update-mimetypes (added)

trunk/common/cache.php

@@ -1 +1 @@
 <?php
+require_once(IA_ROOT_DIR . "common/string.php");
 
 // Check if there is something in the cache newer that date.
@@ -15 +16 @@
 // Recursively delete directories
 function _recursive_delete($path) {
+    $path = realpath($path);
+    log_assert($path != IA_ROOT_DIR . "cache/" &&
+               starts_with($path, IA_ROOT_DIR . "cache/"));
     foreach (glob($path . "/*") as $file_name) {
         if (is_dir($file_name)) {
@@ -83 +87 @@
     $file_name = _disk_cache_path($cache_id);
 
-    @mkdir(dirname($file_name), 0777, true);
+    if (!is_dir(dirname($file_name))) {
+        log_assert(!file_exists(dirname($file_name)),
+                   "Cache directory contains invalid files");
+
+        $old_umask = umask(0);
+        @mkdir(dirname($file_name), 0777, true);
+        umask($old_umask);
+    }
     $ret = @file_put_contents($file_name, $buffer, LOCK_EX);