PEAR::HTTP_Request2 updated to 2.2.1

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

diff --git a/extlib/HTTP/Request2/Adapter/Curl.php b/extlib/HTTP/Request2/Adapter/Curl.php
index c80c94584e5d0a35a38ab783edf97f2b71423d92..ef75b8c9576215eb4dfb27345df6fc4c72e232dd 100644 (file)
--- a/extlib/HTTP/Request2/Adapter/Curl.php
+++ b/extlib/HTTP/Request2/Adapter/Curl.php
@@ -4,41 +4,18 @@
  *\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: Curl.php 324746 2012-04-03 15:09:16Z 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
 /**\r
@@ -52,8 +29,8 @@ require_once 'HTTP/Request2/Adapter.php';
  * @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
  */\r
 class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter\r
@@ -238,6 +215,7 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
      *\r
      * @return   resource    a cURL handle, as created by curl_init()\r
      * @throws   HTTP_Request2_LogicException\r
+     * @throws   HTTP_Request2_NotImplementedException\r
      */\r
     protected function createCurlHandle()\r
     {\r
@@ -278,6 +256,11 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
             }\r
         }\r
 \r
+        // set local IP via CURLOPT_INTERFACE (request #19515)\r
+        if ($ip = $this->request->getConfig('local_ip')) {\r
+            curl_setopt($ch, CURLOPT_INTERFACE, $ip);\r
+        }\r
+\r
         // request timeout\r
         if ($timeout = $this->request->getConfig('timeout')) {\r
             curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);\r
@@ -389,7 +372,7 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
         }\r
 \r
         $this->calculateRequestLength($headers);\r
-        if (isset($headers['content-length'])) {\r
+        if (isset($headers['content-length']) || isset($headers['transfer-encoding'])) {\r
             $this->workaroundPhpBug47204($ch, $headers);\r
         }\r
 \r