Merge pull request #163 from arcfieldOSS/final

Remove race by journaling writes; misc

Author: khoaofgod

phpfastcache/3.0.0/abstract.php

@@ -428,4 +428,4 @@ protected function __setChmodAuto() {
     }
 
 
-}
+}

phpfastcache/3.0.0/drivers/files.php

@@ -70,6 +70,7 @@ private function getFilePath($keyword, $skip = false) {
 
     function driver_set($keyword, $value = "", $time = 300, $option = array() ) {
         $file_path = $this->getFilePath($keyword);
+        $tmp_path = $file_path . ".tmp";
       //  echo "<br>DEBUG SET: ".$keyword." - ".$value." - ".$time."<br>";
         $data = $this->encode($value);
 
@@ -86,22 +87,33 @@ function driver_set($keyword, $value = "", $time = 300, $option = array() ) {
             }
         }
 
-        if($toWrite == true) {
+        $written = true;
+        /*
+         * write to intent file to prevent race during read; race during write is ok
+         * because first-to-lock wins and the file will exist before the writer attempts
+         * to write.
+         */
+        if($toWrite == true && !@file_exists($tmp_path && !@file_exists($file_path))) {
                 try {
-                    $f = @fopen($file_path, "c");
-                    if (flock($f,LOCK_EX| LOCK_NB))  { //got a lock to write;
-                        fwrite($f, $data);
-                        fflush($f);
-                        flock($f,LOCK_UN);
+                    $f = @fopen($tmp_path, "c");
+                    if ($f) {
+                    if (flock($f,LOCK_EX| LOCK_NB))  {
+                            $written = ($written && fwrite($f, $data));
+                            $written = ($written && fflush($f));
+                            $written = ($written && flock($f, LOCK_UN));
                     } else {
                         //arguably the file is being written to so the job is done
+                            $written = false;
+                    }
+                        $written = ($written && @fclose($f));
+                        $written = ($written && @rename($tmp_path,$file_path));
                     }
-                    fclose($f);
                 } catch (Exception $e) {
                     // miss cache
-                    return false;
+                    $written = false;
                 }
         }
+        return $written;
     }
 
     function driver_get($keyword, $option = array()) {

phpfastcache/3.0.0/phpfastcache.php

@@ -159,7 +159,7 @@ public static function getPath($skip_create_path = false, $config) {
             $path = $config['path'];
         }
 
-        $securityKey = $config['securityKey'];
+        $securityKey = array_key_exists('securityKey',$config) ? $config['securityKey'] : "";
         if($securityKey == "" || $securityKey == "auto") {
             $securityKey = self::$config['securityKey'];
             if($securityKey == "auto" || $securityKey == "") {
@@ -193,7 +193,7 @@ public static function getPath($skip_create_path = false, $config) {
 
 
             self::$tmp[$full_pathx] = true;
-            self::htaccessGen($full_path, $config['htaccess']);
+            self::htaccessGen($full_path, array_key_exists('htaccess',$config) ? $config['htaccess'] : false);
         }
 
         return realpath($full_path);