PEAR::HTTP_Request2 updated to 2.2.1

[quix0rs-gnu-social.git] / extlib / HTTP / Request2 / MultipartBody.php

diff --git a/extlib/HTTP/Request2/MultipartBody.php b/extlib/HTTP/Request2/MultipartBody.php
index 53e0c1b9eabfdda4a26ffeb1e9032317e5657593..c68b6602b8ab0634d68f25f49653ed42e82dd9df 100644 (file)
--- a/extlib/HTTP/Request2/MultipartBody.php
+++ b/extlib/HTTP/Request2/MultipartBody.php
@@ -4,43 +4,23 @@
  *\r
  * PHP version 5\r
  *\r
- * LICENSE:\r
+ * LICENSE\r
  *\r
- * Copyright (c) 2008-2012, Alexey Borzov <avb@php.net>\r
- * All rights reserved.\r
+ * This source file is subject to BSD 3-Clause License that is bundled\r
+ * with this package in the file LICENSE and available at the URL\r
+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE\r
  *\r
- * Redistribution and use in source and binary forms, with or without\r
- * modification, are permitted provided that the following conditions\r
- * are met:\r
- *\r
- *    * Redistributions of source code must retain the above copyright\r
- *      notice, this list of conditions and the following disclaimer.\r
- *    * Redistributions in binary form must reproduce the above copyright\r
- *      notice, this list of conditions and the following disclaimer in the\r
- *      documentation and/or other materials provided with the distribution.\r
- *    * The names of the authors may not be used to endorse or promote products\r
- *      derived from this software without specific prior written permission.\r
- *\r
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS\r
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,\r
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\r
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR\r
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\r
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\r
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\r
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY\r
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\r
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
- *\r
- * @category HTTP\r
- * @package  HTTP_Request2\r
- * @author   Alexey Borzov <avb@php.net>\r
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License\r
- * @version  SVN: $Id: MultipartBody.php 324415 2012-03-21 10:50:50Z avb $\r
- * @link     http://pear.php.net/package/HTTP_Request2\r
+ * @category  HTTP\r
+ * @package   HTTP_Request2\r
+ * @author    Alexey Borzov <avb@php.net>\r
+ * @copyright 2008-2014 Alexey Borzov <avb@php.net>\r
+ * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License\r
+ * @link      http://pear.php.net/package/HTTP_Request2\r
  */\r
 \r
+/** Exception class for HTTP_Request2 package */\r
+require_once 'HTTP/Request2/Exception.php';\r
+\r
 /**\r
  * Class for building multipart/form-data request body\r
  *\r
@@ -50,8 +30,8 @@
  * @category HTTP\r
  * @package  HTTP_Request2\r
  * @author   Alexey Borzov <avb@php.net>\r
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License\r
- * @version  Release: 2.1.1\r
+ * @license  http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License\r
+ * @version  Release: 2.2.1\r
  * @link     http://pear.php.net/package/HTTP_Request2\r
  * @link     http://tools.ietf.org/html/rfc1867\r
  */\r
@@ -167,6 +147,7 @@ class HTTP_Request2_MultipartBody
      * @param integer $length Number of bytes to read\r
      *\r
      * @return   string  Up to $length bytes of data, empty string if at end\r
+     * @throws   HTTP_Request2_LogicException\r
      */\r
     public function read($length)\r
     {\r
@@ -194,9 +175,16 @@ class HTTP_Request2_MultipartBody
                     $length -= min(strlen($header) - $this->_pos[1], $length);\r
                 }\r
                 $filePos  = max(0, $this->_pos[1] - strlen($header));\r
-                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {\r
-                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);\r
-                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);\r
+                if ($filePos < $this->_uploads[$pos]['size']) {\r
+                    while ($length > 0 && !feof($this->_uploads[$pos]['fp'])) {\r
+                        if (false === ($chunk = fread($this->_uploads[$pos]['fp'], $length))) {\r
+                            throw new HTTP_Request2_LogicException(\r
+                                'Failed reading file upload', HTTP_Request2_Exception::READ_ERROR\r
+                            );\r
+                        }\r
+                        $ret    .= $chunk;\r
+                        $length -= strlen($chunk);\r
+                    }\r
                 }\r
                 if ($length > 0) {\r
                     $start   = $this->_pos[1] + ($oldLength - $length) -\r