merge r25086 to release-1.12

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

library/Zend/File/Transfer/Adapter/Http.php

@@ -128,6 +128,10 @@ class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstrac
         // Workaround for a PHP error returning empty $_FILES when form data exceeds php settings
         if (empty($this->_files) && ($content > 0)) {
             if (is_array($files)) {
+                if (0 === count($files)) {
+                    return false;
+                }
+
                 $files = current($files);
             }
 

tests/Zend/File/Transfer/Adapter/HttpTest.php

@@ -148,6 +148,18 @@ class Zend_File_Transfer_Adapter_HttpTest extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * @group ZF-12451
+     */
+    public function testReceiveEmptyArray()
+    {
+        $_SERVER['CONTENT_LENGTH'] = 10;
+        $_FILES = array();
+
+        $adapter = new Zend_File_Transfer_Adapter_Http();
+        $this->assertFalse($adapter->receive(array()));
+    }
+
     public function testReceiveValidatedFile()
     {
         $_FILES = array(