zf-11883.patch

Index: tests/Zend/Cloud/StorageService/Adapter/FileSystemTest.php
===================================================================
--- tests/Zend/Cloud/StorageService/Adapter/FileSystemTest.php  (revision 24554)
+++ tests/Zend/Cloud/StorageService/Adapter/FileSystemTest.php  (working copy)
@@ -130,7 +130,7 @@
         } else {
             foreach (scandir($path) as $item) {
                 if (!($item == '.' || $item == '..')) {
-                    $this->_rmRecursive($item);
+                    $this->_rmRecursive($path. '/'. $item);
                 }
             }
             return rmdir($path);
Index: tests/Zend/Cloud/StorageService/TestCase.php
===================================================================
--- tests/Zend/Cloud/StorageService/TestCase.php    (revision 24554)
+++ tests/Zend/Cloud/StorageService/TestCase.php    (working copy)
@@ -179,7 +179,7 @@
         }
     }

-   /**
+    /**
      * Test store item
      *
      * @return void
@@ -207,6 +207,33 @@
     }

     /**
+     * Test store item with a slash in the pathname
+     *
+     * @return void
+     */
+    public function testStoreItemStreamWithSlashedPath()
+    {
+        $dummyNameStream = $this->_dummyNamePrefix . 'ForStore/Stream';
+        try {
+            // Test stream data
+            $originalFilename = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files/data/dummy_data.txt');
+            $stream = fopen($originalFilename, 'r');
+            $this->_commonStorage->storeItem($dummyNameStream, $stream);
+            $this->_wait();
+
+            $returnedData = $this->_commonStorage->fetchItem($dummyNameStream);
+            $this->assertEquals(file_get_contents($originalFilename), $returnedData);
+            $this->_commonStorage->deleteItem($dummyNameStream);
+        } catch (Exception $e) {
+            try {
+                $this->_commonStorage->deleteItem($dummyNameStream);
+            } catch (Zend_Cloud_Exception $ignoreMe) {
+            }
+            throw $e;
+        }
+    }
+
+    /**
      * Test delete item
      *
      * @return void
Index: library/Zend/Cloud/StorageService/Adapter/FileSystem.php
===================================================================
--- library/Zend/Cloud/StorageService/Adapter/FileSystem.php    (revision 24554)
+++ library/Zend/Cloud/StorageService/Adapter/FileSystem.php    (working copy)
@@ -36,6 +36,7 @@
      * Options array keys for the file system adapter.
      */
     const LOCAL_DIRECTORY = 'local_directory';
+    const DIR_MODE = 'dir_mode';

     /**
      * The directory for the data
@@ -44,6 +45,12 @@
     protected $_directory = null;

     /**
+     * The default mode used when creating dirs
+     * @var int
+     */
+    protected $_dir_mode = 0755;
+
+    /**
      * Constructor
      *
      * @param  array|Zend_Config $options
@@ -64,6 +71,10 @@
         } else {
             $this->_directory = realpath(sys_get_temp_dir());
         }
+
+        if (isset($options[self::DIR_MODE])) {
+            $this->_directory = $options[self::DIR_MODE];
+        }
     }

     /**
@@ -103,8 +114,12 @@
     public function storeItem($destinationPath, $data, $options = array())
     {
         $path = $this->_getFullPath($destinationPath);
+        $realpath = dirname($path);
+        if (!file_exists($realpath) && !is_dir($realpath)) {
+            mkdir($realpath, $this->_dir_mode, true);
+        }
         file_put_contents($path, $data);
-        chmod($path, 0777);
+        chmod($path, $this->_dir_mode);
     }

     /**