merge revision 25134 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25135 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Service/Rackspace/Files.php

@@ -332,15 +332,17 @@ class Zend_Service_Rackspace_Files extends Zend_Service_Rackspace_Abstract
         return false;
     }
     /**
-     * Store a file in a container 
+     * Store a file in a container
      *
      * @param string $container
      * @param string $object
      * @param string $content
      * @param array $metadata
+     * @param string $content_type
+     *
      * @return boolean
      */
-    public function storeObject($container,$object,$content,$metadata=array()) {
+    public function storeObject($container,$object,$content,$metadata=array(),$content_type=null) {
         if (empty($container)) {
             require_once 'Zend/Service/Rackspace/Exception.php';
             throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_NAME_CONTAINER);
@@ -353,6 +355,9 @@ class Zend_Service_Rackspace_Files extends Zend_Service_Rackspace_Abstract
             require_once 'Zend/Service/Rackspace/Exception.php';
             throw new Zend_Service_Rackspace_Exception(self::ERROR_PARAM_NO_CONTENT);
         }
+        if (!empty($content_type)) {
+           $headers[self::HEADER_CONTENT_TYPE]= $content_type;
+        }
         if (!empty($metadata) && is_array($metadata)) {
             foreach ($metadata as $key => $value) {
                 $headers[self::METADATA_OBJECT_HEADER.$key]= $value;
@@ -683,4 +688,4 @@ class Zend_Service_Rackspace_Files extends Zend_Service_Rackspace_Abstract
         $this->errorCode= $status;
         return false;
     }
-}
+}