PEAR::HTTP_Request2 updated to 2.2.1

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

diff --git a/extlib/HTTP/Request2/SOCKS5.php b/extlib/HTTP/Request2/SOCKS5.php
index 518289e9c7c3681f9a237ff404370e9b712b0d3f..d54049585946ac90e49d58a63ef8c4d6130ee262 100644 (file)
--- a/extlib/HTTP/Request2/SOCKS5.php
+++ b/extlib/HTTP/Request2/SOCKS5.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: SOCKS5.php 324953 2012-04-08 07:24:12Z 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
 /** Socket wrapper class used by Socket Adapter */\r
@@ -50,8 +27,8 @@ require_once 'HTTP/Request2/SocketWrapper.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
  * @link     http://pear.php.net/bugs/bug.php?id=19332\r
  * @link     http://tools.ietf.org/html/rfc1928\r
@@ -61,21 +38,21 @@ class HTTP_Request2_SOCKS5 extends HTTP_Request2_SocketWrapper
     /**\r
      * Constructor, tries to connect and authenticate to a SOCKS5 proxy\r
      *\r
-     * @param string $address    Proxy address, e.g. 'tcp://localhost:1080'\r
-     * @param int    $timeout    Connection timeout (seconds)\r
-     * @param array  $sslOptions SSL context options\r
-     * @param string $username   Proxy user name\r
-     * @param string $password   Proxy password\r
+     * @param string $address        Proxy address, e.g. 'tcp://localhost:1080'\r
+     * @param int    $timeout        Connection timeout (seconds)\r
+     * @param array  $contextOptions Stream context options\r
+     * @param string $username       Proxy user name\r
+     * @param string $password       Proxy password\r
      *\r
      * @throws HTTP_Request2_LogicException\r
      * @throws HTTP_Request2_ConnectionException\r
      * @throws HTTP_Request2_MessageException\r
      */\r
     public function __construct(\r
-        $address, $timeout = 10, array $sslOptions = array(),\r
+        $address, $timeout = 10, array $contextOptions = array(),\r
         $username = null, $password = null\r
     ) {\r
-        parent::__construct($address, $timeout, $sslOptions);\r
+        parent::__construct($address, $timeout, $contextOptions);\r
 \r
         if (strlen($username)) {\r
             $request = pack('C4', 5, 2, 0, 2);\r