Inspection of "모듈 복제 시, 설정값이 이미 존재하는 모듈을 복제하는 경우 실패" - xpressengine/xe-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — develop (#1782)

unknown

created 2016-03-28 14:25 UTC

Status

Switch Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -435,11 +435,11 @@
 block discarded – undo
 
             try {
                 switch (strtolower($this->getHeader('content-encoding'))) {
-                case 'gzip':
-                    $decoded = self::decodeGzip($this->body);
-                    break;
-                case 'deflate':
-                    $decoded = self::decodeDeflate($this->body);
+                	case 'gzip':
+                    	$decoded = self::decodeGzip($this->body);
+                    	break;
+                	case 'deflate':
+                    	$decoded = self::decodeDeflate($this->body);
                 }
             } catch (Exception $e) {
             }

Please login to merge, or discard this patch.

Spacing +7 added lines, -8 removed lines patch added patch discarded remove patch

@@ -142,7 +142,7 @@  discard block
 block discarded – undo
         // the request
         300 => 'Multiple Choices',
         301 => 'Moved Permanently',
-        302 => 'Found',  // 1.1
+        302 => 'Found', // 1.1
         303 => 'See Other',
         304 => 'Not Modified',
         305 => 'Use Proxy',
@@ -220,8 +220,8 @@  discard block
 block discarded – undo
         $this->version      = $m[1];
         $this->code         = intval($m[2]);
         $this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
-        $this->bodyEncoded  = (bool)$bodyEncoded;
-        $this->effectiveUrl = (string)$effectiveUrl;
+        $this->bodyEncoded  = (bool) $bodyEncoded;
+        $this->effectiveUrl = (string) $effectiveUrl;
     }
 
     /**
@@ -241,9 +241,8 @@  discard block
 block discarded – undo
         if ('' == $headerLine) {
             // empty string signals the end of headers, process the received ones
             if (!empty($this->headers['set-cookie'])) {
-                $cookies = is_array($this->headers['set-cookie'])?
-                           $this->headers['set-cookie']:
-                           array($this->headers['set-cookie']);
+                $cookies = is_array($this->headers['set-cookie']) ?
+                           $this->headers['set-cookie'] : array($this->headers['set-cookie']);
                 foreach ($cookies as $cookieString) {
                     $this->parseCookie($cookieString);
                 }
@@ -400,7 +399,7 @@  discard block
 block discarded – undo
             return $this->headers;
         } else {
             $headerName = strtolower($headerName);
-            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
+            return isset($this->headers[$headerName]) ? $this->headers[$headerName] : null;
         }
     }
 
@@ -625,7 +624,7 @@  discard block
 block discarded – undo
         // We should check for presence of zlib header and use gzuncompress() or
         // gzinflate() as needed. See bug #15305
         $header = unpack('n', substr($data, 0, 2));
-        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
+        return (0 == $header[1] % 31) ? gzuncompress($data) : gzinflate($data);
     }
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Indentation +591 added lines, -591 removed lines patch added patch discarded remove patch

@@ -1,22 +1,22 @@  discard block
 block discarded – undo
 <?php
 /**
- * Class representing a HTTP response
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to BSD 3-Clause License that is bundled
- * with this package in the file LICENSE and available at the URL
- * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
- *
- * @category  HTTP
- * @package   HTTP_Request2
- * @author    Alexey Borzov <[email protected]>
- * @copyright 2008-2014 Alexey Borzov <[email protected]>
- * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @link      http://pear.php.net/package/HTTP_Request2
- */
+	 * Class representing a HTTP response
+	 *
+	 * PHP version 5
+	 *
+	 * LICENSE
+	 *
+	 * This source file is subject to BSD 3-Clause License that is bundled
+	 * with this package in the file LICENSE and available at the URL
+	 * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+	 *
+	 * @category  HTTP
+	 * @package   HTTP_Request2
+	 * @author    Alexey Borzov <[email protected]>
+	 * @copyright 2008-2014 Alexey Borzov <[email protected]>
+	 * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+	 * @link      http://pear.php.net/package/HTTP_Request2
+	 */
 
 /**
  * Exception class for HTTP_Request2 package
@@ -53,579 +53,579 @@  discard block
 block discarded – undo
  */
 class HTTP_Request2_Response
 {
-    /**
-     * HTTP protocol version (e.g. 1.0, 1.1)
-     * @var  string
-     */
-    protected $version;
-
-    /**
-     * Status code
-     * @var  integer
-     * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
-     */
-    protected $code;
-
-    /**
-     * Reason phrase
-     * @var  string
-     * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
-     */
-    protected $reasonPhrase;
-
-    /**
-     * Effective URL (may be different from original request URL in case of redirects)
-     * @var  string
-     */
-    protected $effectiveUrl;
-
-    /**
-     * Associative array of response headers
-     * @var  array
-     */
-    protected $headers = array();
-
-    /**
-     * Cookies set in the response
-     * @var  array
-     */
-    protected $cookies = array();
-
-    /**
-     * Name of last header processed by parseHederLine()
-     *
-     * Used to handle the headers that span multiple lines
-     *
-     * @var  string
-     */
-    protected $lastHeader = null;
-
-    /**
-     * Response body
-     * @var  string
-     */
-    protected $body = '';
-
-    /**
-     * Whether the body is still encoded by Content-Encoding
-     *
-     * cURL provides the decoded body to the callback; if we are reading from
-     * socket the body is still gzipped / deflated
-     *
-     * @var  bool
-     */
-    protected $bodyEncoded;
-
-    /**
-     * Associative array of HTTP status code / reason phrase.
-     *
-     * @var  array
-     * @link http://tools.ietf.org/html/rfc2616#section-10
-     */
-    protected static $phrases = array(
-
-        // 1xx: Informational - Request received, continuing process
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-
-        // 2xx: Success - The action was successfully received, understood and
-        // accepted
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-
-        // 3xx: Redirection - Further action must be taken in order to complete
-        // the request
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',  // 1.1
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-
-        // 4xx: Client Error - The request contains bad syntax or cannot be
-        // fulfilled
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-
-        // 5xx: Server Error - The server failed to fulfill an apparently
-        // valid request
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        509 => 'Bandwidth Limit Exceeded',
-
-    );
-
-    /**
-     * Returns the default reason phrase for the given code or all reason phrases
-     *
-     * @param int $code Response code
-     *
-     * @return string|array|null Default reason phrase for $code if $code is given
-     *                           (null if no phrase is available), array of all
-     *                           reason phrases if $code is null
-     * @link   http://pear.php.net/bugs/18716
-     */
-    public static function getDefaultReasonPhrase($code = null)
-    {
-        if (null === $code) {
-            return self::$phrases;
-        } else {
-            return isset(self::$phrases[$code]) ? self::$phrases[$code] : null;
-        }
-    }
-
-    /**
-     * Constructor, parses the response status line
-     *
-     * @param string $statusLine   Response status line (e.g. "HTTP/1.1 200 OK")
-     * @param bool   $bodyEncoded  Whether body is still encoded by Content-Encoding
-     * @param string $effectiveUrl Effective URL of the response
-     *
-     * @throws   HTTP_Request2_MessageException if status line is invalid according to spec
-     */
-    public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)
-    {
-        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
-            throw new HTTP_Request2_MessageException(
-                "Malformed response: {$statusLine}",
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
-            );
-        }
-        $this->version      = $m[1];
-        $this->code         = intval($m[2]);
-        $this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
-        $this->bodyEncoded  = (bool)$bodyEncoded;
-        $this->effectiveUrl = (string)$effectiveUrl;
-    }
-
-    /**
-     * Parses the line from HTTP response filling $headers array
-     *
-     * The method should be called after reading the line from socket or receiving
-     * it into cURL callback. Passing an empty string here indicates the end of
-     * response headers and triggers additional processing, so be sure to pass an
-     * empty string in the end.
-     *
-     * @param string $headerLine Line from HTTP response
-     */
-    public function parseHeaderLine($headerLine)
-    {
-        $headerLine = trim($headerLine, "\r\n");
-
-        if ('' == $headerLine) {
-            // empty string signals the end of headers, process the received ones
-            if (!empty($this->headers['set-cookie'])) {
-                $cookies = is_array($this->headers['set-cookie'])?
-                           $this->headers['set-cookie']:
-                           array($this->headers['set-cookie']);
-                foreach ($cookies as $cookieString) {
-                    $this->parseCookie($cookieString);
-                }
-                unset($this->headers['set-cookie']);
-            }
-            foreach (array_keys($this->headers) as $k) {
-                if (is_array($this->headers[$k])) {
-                    $this->headers[$k] = implode(', ', $this->headers[$k]);
-                }
-            }
-
-        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
-            // string of the form header-name: header value
-            $name  = strtolower($m[1]);
-            $value = trim($m[2]);
-            if (empty($this->headers[$name])) {
-                $this->headers[$name] = $value;
-            } else {
-                if (!is_array($this->headers[$name])) {
-                    $this->headers[$name] = array($this->headers[$name]);
-                }
-                $this->headers[$name][] = $value;
-            }
-            $this->lastHeader = $name;
-
-        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
-            // continuation of a previous header
-            if (!is_array($this->headers[$this->lastHeader])) {
-                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
-            } else {
-                $key = count($this->headers[$this->lastHeader]) - 1;
-                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
-            }
-        }
-    }
-
-    /**
-     * Parses a Set-Cookie header to fill $cookies array
-     *
-     * @param string $cookieString value of Set-Cookie header
-     *
-     * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
-     */
-    protected function parseCookie($cookieString)
-    {
-        $cookie = array(
-            'expires' => null,
-            'domain'  => null,
-            'path'    => null,
-            'secure'  => false
-        );
-
-        if (!strpos($cookieString, ';')) {
-            // Only a name=value pair
-            $pos = strpos($cookieString, '=');
-            $cookie['name']  = trim(substr($cookieString, 0, $pos));
-            $cookie['value'] = trim(substr($cookieString, $pos + 1));
-
-        } else {
-            // Some optional parameters are supplied
-            $elements = explode(';', $cookieString);
-            $pos = strpos($elements[0], '=');
-            $cookie['name']  = trim(substr($elements[0], 0, $pos));
-            $cookie['value'] = trim(substr($elements[0], $pos + 1));
-
-            for ($i = 1; $i < count($elements); $i++) {
-                if (false === strpos($elements[$i], '=')) {
-                    $elName  = trim($elements[$i]);
-                    $elValue = null;
-                } else {
-                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
-                }
-                $elName = strtolower($elName);
-                if ('secure' == $elName) {
-                    $cookie['secure'] = true;
-                } elseif ('expires' == $elName) {
-                    $cookie['expires'] = str_replace('"', '', $elValue);
-                } elseif ('path' == $elName || 'domain' == $elName) {
-                    $cookie[$elName] = urldecode($elValue);
-                } else {
-                    $cookie[$elName] = $elValue;
-                }
-            }
-        }
-        $this->cookies[] = $cookie;
-    }
-
-    /**
-     * Appends a string to the response body
-     *
-     * @param string $bodyChunk part of response body
-     */
-    public function appendBody($bodyChunk)
-    {
-        $this->body .= $bodyChunk;
-    }
-
-    /**
-     * Returns the effective URL of the response
-     *
-     * This may be different from the request URL if redirects were followed.
-     *
-     * @return string
-     * @link   http://pear.php.net/bugs/bug.php?id=18412
-     */
-    public function getEffectiveUrl()
-    {
-        return $this->effectiveUrl;
-    }
-
-    /**
-     * Returns the status code
-     *
-     * @return   integer
-     */
-    public function getStatus()
-    {
-        return $this->code;
-    }
-
-    /**
-     * Returns the reason phrase
-     *
-     * @return   string
-     */
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
-
-    /**
-     * Whether response is a redirect that can be automatically handled by HTTP_Request2
-     *
-     * @return   bool
-     */
-    public function isRedirect()
-    {
-        return in_array($this->code, array(300, 301, 302, 303, 307))
-               && isset($this->headers['location']);
-    }
-
-    /**
-     * Returns either the named header or all response headers
-     *
-     * @param string $headerName Name of header to return
-     *
-     * @return   string|array    Value of $headerName header (null if header is
-     *                           not present), array of all response headers if
-     *                           $headerName is null
-     */
-    public function getHeader($headerName = null)
-    {
-        if (null === $headerName) {
-            return $this->headers;
-        } else {
-            $headerName = strtolower($headerName);
-            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
-        }
-    }
-
-    /**
-     * Returns cookies set in response
-     *
-     * @return   array
-     */
-    public function getCookies()
-    {
-        return $this->cookies;
-    }
-
-    /**
-     * Returns the body of the response
-     *
-     * @return   string
-     * @throws   HTTP_Request2_Exception if body cannot be decoded
-     */
-    public function getBody()
-    {
-        if (0 == strlen($this->body) || !$this->bodyEncoded
-            || !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
-        ) {
-            return $this->body;
-
-        } else {
-            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-                $oldEncoding = mb_internal_encoding();
-                mb_internal_encoding('8bit');
-            }
-
-            try {
-                switch (strtolower($this->getHeader('content-encoding'))) {
-                case 'gzip':
-                    $decoded = self::decodeGzip($this->body);
-                    break;
-                case 'deflate':
-                    $decoded = self::decodeDeflate($this->body);
-                }
-            } catch (Exception $e) {
-            }
-
-            if (!empty($oldEncoding)) {
-                mb_internal_encoding($oldEncoding);
-            }
-            if (!empty($e)) {
-                throw $e;
-            }
-            return $decoded;
-        }
-    }
-
-    /**
-     * Get the HTTP version of the response
-     *
-     * @return   string
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * Decodes the message-body encoded by gzip
-     *
-     * The real decoding work is done by gzinflate() built-in function, this
-     * method only parses the header and checks data for compliance with
-     * RFC 1952
-     *
-     * @param string $data gzip-encoded data
-     *
-     * @return   string  decoded data
-     * @throws   HTTP_Request2_LogicException
-     * @throws   HTTP_Request2_MessageException
-     * @link     http://tools.ietf.org/html/rfc1952
-     */
-    public static function decodeGzip($data)
-    {
-        $length = strlen($data);
-        // If it doesn't look like gzip-encoded data, don't bother
-        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
-            return $data;
-        }
-        if (!function_exists('gzinflate')) {
-            throw new HTTP_Request2_LogicException(
-                'Unable to decode body: gzip extension not available',
-                HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-        $method = ord(substr($data, 2, 1));
-        if (8 != $method) {
-            throw new HTTP_Request2_MessageException(
-                'Error parsing gzip header: unknown compression method',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        }
-        $flags = ord(substr($data, 3, 1));
-        if ($flags & 224) {
-            throw new HTTP_Request2_MessageException(
-                'Error parsing gzip header: reserved bits are set',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        }
-
-        // header is 10 bytes minimum. may be longer, though.
-        $headerLength = 10;
-        // extra fields, need to skip 'em
-        if ($flags & 4) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $extraLength = unpack('v', substr($data, 10, 2));
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += $extraLength[1] + 2;
-        }
-        // file name, need to skip that
-        if ($flags & 8) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += $filenameLength + 1;
-        }
-        // comment, need to skip that also
-        if ($flags & 16) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += $commentLength + 1;
-        }
-        // have a CRC for header. let's check
-        if ($flags & 2) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
-            if ($crcReal != $crcStored[1]) {
-                throw new HTTP_Request2_MessageException(
-                    'Header CRC check failed',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += 2;
-        }
-        // unpacked data CRC and size at the end of encoded data
-        $tmp = unpack('V2', substr($data, -8));
-        $dataCrc  = $tmp[1];
-        $dataSize = $tmp[2];
-
-        // finally, call the gzinflate() function
-        // don't pass $dataSize to gzinflate, see bugs #13135, #14370
-        $unpacked = gzinflate(substr($data, $headerLength, -8));
-        if (false === $unpacked) {
-            throw new HTTP_Request2_MessageException(
-                'gzinflate() call failed',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        } elseif ($dataSize != strlen($unpacked)) {
-            throw new HTTP_Request2_MessageException(
-                'Data size check failed',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            throw new HTTP_Request2_Exception(
-                'Data CRC check failed',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        }
-        return $unpacked;
-    }
-
-    /**
-     * Decodes the message-body encoded by deflate
-     *
-     * @param string $data deflate-encoded data
-     *
-     * @return   string  decoded data
-     * @throws   HTTP_Request2_LogicException
-     */
-    public static function decodeDeflate($data)
-    {
-        if (!function_exists('gzuncompress')) {
-            throw new HTTP_Request2_LogicException(
-                'Unable to decode body: gzip extension not available',
-                HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
-        // while many applications send raw deflate stream from RFC 1951.
-        // We should check for presence of zlib header and use gzuncompress() or
-        // gzinflate() as needed. See bug #15305
-        $header = unpack('n', substr($data, 0, 2));
-        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
-    }
+	/**
+	 * HTTP protocol version (e.g. 1.0, 1.1)
+	 * @var  string
+	 */
+	protected $version;
+
+	/**
+	 * Status code
+	 * @var  integer
+	 * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
+	 */
+	protected $code;
+
+	/**
+	 * Reason phrase
+	 * @var  string
+	 * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
+	 */
+	protected $reasonPhrase;
+
+	/**
+	 * Effective URL (may be different from original request URL in case of redirects)
+	 * @var  string
+	 */
+	protected $effectiveUrl;
+
+	/**
+	 * Associative array of response headers
+	 * @var  array
+	 */
+	protected $headers = array();
+
+	/**
+	 * Cookies set in the response
+	 * @var  array
+	 */
+	protected $cookies = array();
+
+	/**
+	 * Name of last header processed by parseHederLine()
+	 *
+	 * Used to handle the headers that span multiple lines
+	 *
+	 * @var  string
+	 */
+	protected $lastHeader = null;
+
+	/**
+	 * Response body
+	 * @var  string
+	 */
+	protected $body = '';
+
+	/**
+	 * Whether the body is still encoded by Content-Encoding
+	 *
+	 * cURL provides the decoded body to the callback; if we are reading from
+	 * socket the body is still gzipped / deflated
+	 *
+	 * @var  bool
+	 */
+	protected $bodyEncoded;
+
+	/**
+	 * Associative array of HTTP status code / reason phrase.
+	 *
+	 * @var  array
+	 * @link http://tools.ietf.org/html/rfc2616#section-10
+	 */
+	protected static $phrases = array(
+
+		// 1xx: Informational - Request received, continuing process
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+
+		// 2xx: Success - The action was successfully received, understood and
+		// accepted
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information',
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+
+		// 3xx: Redirection - Further action must be taken in order to complete
+		// the request
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found',  // 1.1
+		303 => 'See Other',
+		304 => 'Not Modified',
+		305 => 'Use Proxy',
+		307 => 'Temporary Redirect',
+
+		// 4xx: Client Error - The request contains bad syntax or cannot be
+		// fulfilled
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition Failed',
+		413 => 'Request Entity Too Large',
+		414 => 'Request-URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Requested Range Not Satisfiable',
+		417 => 'Expectation Failed',
+
+		// 5xx: Server Error - The server failed to fulfill an apparently
+		// valid request
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported',
+		509 => 'Bandwidth Limit Exceeded',
+
+	);
+
+	/**
+	 * Returns the default reason phrase for the given code or all reason phrases
+	 *
+	 * @param int $code Response code
+	 *
+	 * @return string|array|null Default reason phrase for $code if $code is given
+	 *                           (null if no phrase is available), array of all
+	 *                           reason phrases if $code is null
+	 * @link   http://pear.php.net/bugs/18716
+	 */
+	public static function getDefaultReasonPhrase($code = null)
+	{
+		if (null === $code) {
+			return self::$phrases;
+		} else {
+			return isset(self::$phrases[$code]) ? self::$phrases[$code] : null;
+		}
+	}
+
+	/**
+	 * Constructor, parses the response status line
+	 *
+	 * @param string $statusLine   Response status line (e.g. "HTTP/1.1 200 OK")
+	 * @param bool   $bodyEncoded  Whether body is still encoded by Content-Encoding
+	 * @param string $effectiveUrl Effective URL of the response
+	 *
+	 * @throws   HTTP_Request2_MessageException if status line is invalid according to spec
+	 */
+	public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)
+	{
+		if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
+			throw new HTTP_Request2_MessageException(
+				"Malformed response: {$statusLine}",
+				HTTP_Request2_Exception::MALFORMED_RESPONSE
+			);
+		}
+		$this->version      = $m[1];
+		$this->code         = intval($m[2]);
+		$this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
+		$this->bodyEncoded  = (bool)$bodyEncoded;
+		$this->effectiveUrl = (string)$effectiveUrl;
+	}
+
+	/**
+	 * Parses the line from HTTP response filling $headers array
+	 *
+	 * The method should be called after reading the line from socket or receiving
+	 * it into cURL callback. Passing an empty string here indicates the end of
+	 * response headers and triggers additional processing, so be sure to pass an
+	 * empty string in the end.
+	 *
+	 * @param string $headerLine Line from HTTP response
+	 */
+	public function parseHeaderLine($headerLine)
+	{
+		$headerLine = trim($headerLine, "\r\n");
+
+		if ('' == $headerLine) {
+			// empty string signals the end of headers, process the received ones
+			if (!empty($this->headers['set-cookie'])) {
+				$cookies = is_array($this->headers['set-cookie'])?
+						   $this->headers['set-cookie']:
+						   array($this->headers['set-cookie']);
+				foreach ($cookies as $cookieString) {
+					$this->parseCookie($cookieString);
+				}
+				unset($this->headers['set-cookie']);
+			}
+			foreach (array_keys($this->headers) as $k) {
+				if (is_array($this->headers[$k])) {
+					$this->headers[$k] = implode(', ', $this->headers[$k]);
+				}
+			}
+
+		} elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
+			// string of the form header-name: header value
+			$name  = strtolower($m[1]);
+			$value = trim($m[2]);
+			if (empty($this->headers[$name])) {
+				$this->headers[$name] = $value;
+			} else {
+				if (!is_array($this->headers[$name])) {
+					$this->headers[$name] = array($this->headers[$name]);
+				}
+				$this->headers[$name][] = $value;
+			}
+			$this->lastHeader = $name;
+
+		} elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
+			// continuation of a previous header
+			if (!is_array($this->headers[$this->lastHeader])) {
+				$this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
+			} else {
+				$key = count($this->headers[$this->lastHeader]) - 1;
+				$this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
+			}
+		}
+	}
+
+	/**
+	 * Parses a Set-Cookie header to fill $cookies array
+	 *
+	 * @param string $cookieString value of Set-Cookie header
+	 *
+	 * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
+	 */
+	protected function parseCookie($cookieString)
+	{
+		$cookie = array(
+			'expires' => null,
+			'domain'  => null,
+			'path'    => null,
+			'secure'  => false
+		);
+
+		if (!strpos($cookieString, ';')) {
+			// Only a name=value pair
+			$pos = strpos($cookieString, '=');
+			$cookie['name']  = trim(substr($cookieString, 0, $pos));
+			$cookie['value'] = trim(substr($cookieString, $pos + 1));
+
+		} else {
+			// Some optional parameters are supplied
+			$elements = explode(';', $cookieString);
+			$pos = strpos($elements[0], '=');
+			$cookie['name']  = trim(substr($elements[0], 0, $pos));
+			$cookie['value'] = trim(substr($elements[0], $pos + 1));
+
+			for ($i = 1; $i < count($elements); $i++) {
+				if (false === strpos($elements[$i], '=')) {
+					$elName  = trim($elements[$i]);
+					$elValue = null;
+				} else {
+					list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
+				}
+				$elName = strtolower($elName);
+				if ('secure' == $elName) {
+					$cookie['secure'] = true;
+				} elseif ('expires' == $elName) {
+					$cookie['expires'] = str_replace('"', '', $elValue);
+				} elseif ('path' == $elName || 'domain' == $elName) {
+					$cookie[$elName] = urldecode($elValue);
+				} else {
+					$cookie[$elName] = $elValue;
+				}
+			}
+		}
+		$this->cookies[] = $cookie;
+	}
+
+	/**
+	 * Appends a string to the response body
+	 *
+	 * @param string $bodyChunk part of response body
+	 */
+	public function appendBody($bodyChunk)
+	{
+		$this->body .= $bodyChunk;
+	}
+
+	/**
+	 * Returns the effective URL of the response
+	 *
+	 * This may be different from the request URL if redirects were followed.
+	 *
+	 * @return string
+	 * @link   http://pear.php.net/bugs/bug.php?id=18412
+	 */
+	public function getEffectiveUrl()
+	{
+		return $this->effectiveUrl;
+	}
+
+	/**
+	 * Returns the status code
+	 *
+	 * @return   integer
+	 */
+	public function getStatus()
+	{
+		return $this->code;
+	}
+
+	/**
+	 * Returns the reason phrase
+	 *
+	 * @return   string
+	 */
+	public function getReasonPhrase()
+	{
+		return $this->reasonPhrase;
+	}
+
+	/**
+	 * Whether response is a redirect that can be automatically handled by HTTP_Request2
+	 *
+	 * @return   bool
+	 */
+	public function isRedirect()
+	{
+		return in_array($this->code, array(300, 301, 302, 303, 307))
+			   && isset($this->headers['location']);
+	}
+
+	/**
+	 * Returns either the named header or all response headers
+	 *
+	 * @param string $headerName Name of header to return
+	 *
+	 * @return   string|array    Value of $headerName header (null if header is
+	 *                           not present), array of all response headers if
+	 *                           $headerName is null
+	 */
+	public function getHeader($headerName = null)
+	{
+		if (null === $headerName) {
+			return $this->headers;
+		} else {
+			$headerName = strtolower($headerName);
+			return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
+		}
+	}
+
+	/**
+	 * Returns cookies set in response
+	 *
+	 * @return   array
+	 */
+	public function getCookies()
+	{
+		return $this->cookies;
+	}
+
+	/**
+	 * Returns the body of the response
+	 *
+	 * @return   string
+	 * @throws   HTTP_Request2_Exception if body cannot be decoded
+	 */
+	public function getBody()
+	{
+		if (0 == strlen($this->body) || !$this->bodyEncoded
+			|| !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
+		) {
+			return $this->body;
+
+		} else {
+			if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
+				$oldEncoding = mb_internal_encoding();
+				mb_internal_encoding('8bit');
+			}
+
+			try {
+				switch (strtolower($this->getHeader('content-encoding'))) {
+				case 'gzip':
+					$decoded = self::decodeGzip($this->body);
+					break;
+				case 'deflate':
+					$decoded = self::decodeDeflate($this->body);
+				}
+			} catch (Exception $e) {
+			}
+
+			if (!empty($oldEncoding)) {
+				mb_internal_encoding($oldEncoding);
+			}
+			if (!empty($e)) {
+				throw $e;
+			}
+			return $decoded;
+		}
+	}
+
+	/**
+	 * Get the HTTP version of the response
+	 *
+	 * @return   string
+	 */
+	public function getVersion()
+	{
+		return $this->version;
+	}
+
+	/**
+	 * Decodes the message-body encoded by gzip
+	 *
+	 * The real decoding work is done by gzinflate() built-in function, this
+	 * method only parses the header and checks data for compliance with
+	 * RFC 1952
+	 *
+	 * @param string $data gzip-encoded data
+	 *
+	 * @return   string  decoded data
+	 * @throws   HTTP_Request2_LogicException
+	 * @throws   HTTP_Request2_MessageException
+	 * @link     http://tools.ietf.org/html/rfc1952
+	 */
+	public static function decodeGzip($data)
+	{
+		$length = strlen($data);
+		// If it doesn't look like gzip-encoded data, don't bother
+		if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
+			return $data;
+		}
+		if (!function_exists('gzinflate')) {
+			throw new HTTP_Request2_LogicException(
+				'Unable to decode body: gzip extension not available',
+				HTTP_Request2_Exception::MISCONFIGURATION
+			);
+		}
+		$method = ord(substr($data, 2, 1));
+		if (8 != $method) {
+			throw new HTTP_Request2_MessageException(
+				'Error parsing gzip header: unknown compression method',
+				HTTP_Request2_Exception::DECODE_ERROR
+			);
+		}
+		$flags = ord(substr($data, 3, 1));
+		if ($flags & 224) {
+			throw new HTTP_Request2_MessageException(
+				'Error parsing gzip header: reserved bits are set',
+				HTTP_Request2_Exception::DECODE_ERROR
+			);
+		}
+
+		// header is 10 bytes minimum. may be longer, though.
+		$headerLength = 10;
+		// extra fields, need to skip 'em
+		if ($flags & 4) {
+			if ($length - $headerLength - 2 < 8) {
+				throw new HTTP_Request2_MessageException(
+					'Error parsing gzip header: data too short',
+					HTTP_Request2_Exception::DECODE_ERROR
+				);
+			}
+			$extraLength = unpack('v', substr($data, 10, 2));
+			if ($length - $headerLength - 2 - $extraLength[1] < 8) {
+				throw new HTTP_Request2_MessageException(
+					'Error parsing gzip header: data too short',
+					HTTP_Request2_Exception::DECODE_ERROR
+				);
+			}
+			$headerLength += $extraLength[1] + 2;
+		}
+		// file name, need to skip that
+		if ($flags & 8) {
+			if ($length - $headerLength - 1 < 8) {
+				throw new HTTP_Request2_MessageException(
+					'Error parsing gzip header: data too short',
+					HTTP_Request2_Exception::DECODE_ERROR
+				);
+			}
+			$filenameLength = strpos(substr($data, $headerLength), chr(0));
+			if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
+				throw new HTTP_Request2_MessageException(
+					'Error parsing gzip header: data too short',
+					HTTP_Request2_Exception::DECODE_ERROR
+				);
+			}
+			$headerLength += $filenameLength + 1;
+		}
+		// comment, need to skip that also
+		if ($flags & 16) {
+			if ($length - $headerLength - 1 < 8) {
+				throw new HTTP_Request2_MessageException(
+					'Error parsing gzip header: data too short',
+					HTTP_Request2_Exception::DECODE_ERROR
+				);
+			}
+			$commentLength = strpos(substr($data, $headerLength), chr(0));
+			if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
+				throw new HTTP_Request2_MessageException(
+					'Error parsing gzip header: data too short',
+					HTTP_Request2_Exception::DECODE_ERROR
+				);
+			}
+			$headerLength += $commentLength + 1;
+		}
+		// have a CRC for header. let's check
+		if ($flags & 2) {
+			if ($length - $headerLength - 2 < 8) {
+				throw new HTTP_Request2_MessageException(
+					'Error parsing gzip header: data too short',
+					HTTP_Request2_Exception::DECODE_ERROR
+				);
+			}
+			$crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
+			$crcStored = unpack('v', substr($data, $headerLength, 2));
+			if ($crcReal != $crcStored[1]) {
+				throw new HTTP_Request2_MessageException(
+					'Header CRC check failed',
+					HTTP_Request2_Exception::DECODE_ERROR
+				);
+			}
+			$headerLength += 2;
+		}
+		// unpacked data CRC and size at the end of encoded data
+		$tmp = unpack('V2', substr($data, -8));
+		$dataCrc  = $tmp[1];
+		$dataSize = $tmp[2];
+
+		// finally, call the gzinflate() function
+		// don't pass $dataSize to gzinflate, see bugs #13135, #14370
+		$unpacked = gzinflate(substr($data, $headerLength, -8));
+		if (false === $unpacked) {
+			throw new HTTP_Request2_MessageException(
+				'gzinflate() call failed',
+				HTTP_Request2_Exception::DECODE_ERROR
+			);
+		} elseif ($dataSize != strlen($unpacked)) {
+			throw new HTTP_Request2_MessageException(
+				'Data size check failed',
+				HTTP_Request2_Exception::DECODE_ERROR
+			);
+		} elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
+			throw new HTTP_Request2_Exception(
+				'Data CRC check failed',
+				HTTP_Request2_Exception::DECODE_ERROR
+			);
+		}
+		return $unpacked;
+	}
+
+	/**
+	 * Decodes the message-body encoded by deflate
+	 *
+	 * @param string $data deflate-encoded data
+	 *
+	 * @return   string  decoded data
+	 * @throws   HTTP_Request2_LogicException
+	 */
+	public static function decodeDeflate($data)
+	{
+		if (!function_exists('gzuncompress')) {
+			throw new HTTP_Request2_LogicException(
+				'Unable to decode body: gzip extension not available',
+				HTTP_Request2_Exception::MISCONFIGURATION
+			);
+		}
+		// RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
+		// while many applications send raw deflate stream from RFC 1951.
+		// We should check for presence of zlib header and use gzuncompress() or
+		// gzinflate() as needed. See bug #15305
+		$header = unpack('n', substr($data, 0, 2));
+		return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

libs/PEAR.1.9.5/HTTP/Request2/SOCKS5.php 3 patches

Indentation +108 added lines, -108 removed lines patch added patch discarded remove patch

@@ -1,22 +1,22 @@  discard block
 block discarded – undo
 <?php
 /**
- * SOCKS5 proxy connection class
- *
- * PHP version 5
- *
- * LICENSE
- *
- * This source file is subject to BSD 3-Clause License that is bundled
- * with this package in the file LICENSE and available at the URL
- * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
- *
- * @category  HTTP
- * @package   HTTP_Request2
- * @author    Alexey Borzov <[email protected]>
- * @copyright 2008-2014 Alexey Borzov <[email protected]>
- * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
- * @link      http://pear.php.net/package/HTTP_Request2
- */
+	 * SOCKS5 proxy connection class
+	 *
+	 * PHP version 5
+	 *
+	 * LICENSE
+	 *
+	 * This source file is subject to BSD 3-Clause License that is bundled
+	 * with this package in the file LICENSE and available at the URL
+	 * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
+	 *
+	 * @category  HTTP
+	 * @package   HTTP_Request2
+	 * @author    Alexey Borzov <[email protected]>
+	 * @copyright 2008-2014 Alexey Borzov <[email protected]>
+	 * @license   http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
+	 * @link      http://pear.php.net/package/HTTP_Request2
+	 */
 
 /** Socket wrapper class used by Socket Adapter */
 require_once 'HTTP/Request2/SocketWrapper.php';
@@ -35,101 +35,101 @@  discard block
 block discarded – undo
  */
 class HTTP_Request2_SOCKS5 extends HTTP_Request2_SocketWrapper
 {
-    /**
-     * Constructor, tries to connect and authenticate to a SOCKS5 proxy
-     *
-     * @param string $address        Proxy address, e.g. 'tcp://localhost:1080'
-     * @param int    $timeout        Connection timeout (seconds)
-     * @param array  $contextOptions Stream context options
-     * @param string $username       Proxy user name
-     * @param string $password       Proxy password
-     *
-     * @throws HTTP_Request2_LogicException
-     * @throws HTTP_Request2_ConnectionException
-     * @throws HTTP_Request2_MessageException
-     */
-    public function __construct(
-        $address, $timeout = 10, array $contextOptions = array(),
-        $username = null, $password = null
-    ) {
-        parent::__construct($address, $timeout, $contextOptions);
+	/**
+	 * Constructor, tries to connect and authenticate to a SOCKS5 proxy
+	 *
+	 * @param string $address        Proxy address, e.g. 'tcp://localhost:1080'
+	 * @param int    $timeout        Connection timeout (seconds)
+	 * @param array  $contextOptions Stream context options
+	 * @param string $username       Proxy user name
+	 * @param string $password       Proxy password
+	 *
+	 * @throws HTTP_Request2_LogicException
+	 * @throws HTTP_Request2_ConnectionException
+	 * @throws HTTP_Request2_MessageException
+	 */
+	public function __construct(
+		$address, $timeout = 10, array $contextOptions = array(),
+		$username = null, $password = null
+	) {
+		parent::__construct($address, $timeout, $contextOptions);
 
-        if (strlen($username)) {
-            $request = pack('C4', 5, 2, 0, 2);
-        } else {
-            $request = pack('C3', 5, 1, 0);
-        }
-        $this->write($request);
-        $response = unpack('Cversion/Cmethod', $this->read(3));
-        if (5 != $response['version']) {
-            throw new HTTP_Request2_MessageException(
-                'Invalid version received from SOCKS5 proxy: ' . $response['version'],
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
-            );
-        }
-        switch ($response['method']) {
-        case 2:
-            $this->performAuthentication($username, $password);
-        case 0:
-            break;
-        default:
-            throw new HTTP_Request2_ConnectionException(
-                "Connection rejected by proxy due to unsupported auth method"
-            );
-        }
-    }
+		if (strlen($username)) {
+			$request = pack('C4', 5, 2, 0, 2);
+		} else {
+			$request = pack('C3', 5, 1, 0);
+		}
+		$this->write($request);
+		$response = unpack('Cversion/Cmethod', $this->read(3));
+		if (5 != $response['version']) {
+			throw new HTTP_Request2_MessageException(
+				'Invalid version received from SOCKS5 proxy: ' . $response['version'],
+				HTTP_Request2_Exception::MALFORMED_RESPONSE
+			);
+		}
+		switch ($response['method']) {
+		case 2:
+			$this->performAuthentication($username, $password);
+		case 0:
+			break;
+		default:
+			throw new HTTP_Request2_ConnectionException(
+				"Connection rejected by proxy due to unsupported auth method"
+			);
+		}
+	}
 
-    /**
-     * Performs username/password authentication for SOCKS5
-     *
-     * @param string $username Proxy user name
-     * @param string $password Proxy password
-     *
-     * @throws HTTP_Request2_ConnectionException
-     * @throws HTTP_Request2_MessageException
-     * @link http://tools.ietf.org/html/rfc1929
-     */
-    protected function performAuthentication($username, $password)
-    {
-        $request  = pack('C2', 1, strlen($username)) . $username
-                    . pack('C', strlen($password)) . $password;
+	/**
+	 * Performs username/password authentication for SOCKS5
+	 *
+	 * @param string $username Proxy user name
+	 * @param string $password Proxy password
+	 *
+	 * @throws HTTP_Request2_ConnectionException
+	 * @throws HTTP_Request2_MessageException
+	 * @link http://tools.ietf.org/html/rfc1929
+	 */
+	protected function performAuthentication($username, $password)
+	{
+		$request  = pack('C2', 1, strlen($username)) . $username
+					. pack('C', strlen($password)) . $password;
 
-        $this->write($request);
-        $response = unpack('Cvn/Cstatus', $this->read(3));
-        if (1 != $response['vn'] || 0 != $response['status']) {
-            throw new HTTP_Request2_ConnectionException(
-                'Connection rejected by proxy due to invalid username and/or password'
-            );
-        }
-    }
+		$this->write($request);
+		$response = unpack('Cvn/Cstatus', $this->read(3));
+		if (1 != $response['vn'] || 0 != $response['status']) {
+			throw new HTTP_Request2_ConnectionException(
+				'Connection rejected by proxy due to invalid username and/or password'
+			);
+		}
+	}
 
-    /**
-     * Connects to a remote host via proxy
-     *
-     * @param string $remoteHost Remote host
-     * @param int    $remotePort Remote port
-     *
-     * @throws HTTP_Request2_ConnectionException
-     * @throws HTTP_Request2_MessageException
-     */
-    public function connect($remoteHost, $remotePort)
-    {
-        $request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))
-                   . $remoteHost . pack('n', $remotePort);
+	/**
+	 * Connects to a remote host via proxy
+	 *
+	 * @param string $remoteHost Remote host
+	 * @param int    $remotePort Remote port
+	 *
+	 * @throws HTTP_Request2_ConnectionException
+	 * @throws HTTP_Request2_MessageException
+	 */
+	public function connect($remoteHost, $remotePort)
+	{
+		$request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))
+				   . $remoteHost . pack('n', $remotePort);
 
-        $this->write($request);
-        $response = unpack('Cversion/Creply/Creserved', $this->read(1024));
-        if (5 != $response['version'] || 0 != $response['reserved']) {
-            throw new HTTP_Request2_MessageException(
-                'Invalid response received from SOCKS5 proxy',
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
-            );
-        } elseif (0 != $response['reply']) {
-            throw new HTTP_Request2_ConnectionException(
-                "Unable to connect to {$remoteHost}:{$remotePort} through SOCKS5 proxy",
-                0, $response['reply']
-            );
-        }
-    }
+		$this->write($request);
+		$response = unpack('Cversion/Creply/Creserved', $this->read(1024));
+		if (5 != $response['version'] || 0 != $response['reserved']) {
+			throw new HTTP_Request2_MessageException(
+				'Invalid response received from SOCKS5 proxy',
+				HTTP_Request2_Exception::MALFORMED_RESPONSE
+			);
+		} elseif (0 != $response['reply']) {
+			throw new HTTP_Request2_ConnectionException(
+				"Unable to connect to {$remoteHost}:{$remotePort} through SOCKS5 proxy",
+				0, $response['reply']
+			);
+		}
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Switch Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -68,14 +68,14 @@
 block discarded – undo
             );
         }
         switch ($response['method']) {
-        case 2:
-            $this->performAuthentication($username, $password);
-        case 0:
-            break;
-        default:
-            throw new HTTP_Request2_ConnectionException(
-                "Connection rejected by proxy due to unsupported auth method"
-            );
+        	case 2:
+            	$this->performAuthentication($username, $password);
+        	case 0:
+            	break;
+        	default:
+            	throw new HTTP_Request2_ConnectionException(
+                	"Connection rejected by proxy due to unsupported auth method"
+            	);
         }
     }
 

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -91,7 +91,7 @@
 block discarded – undo
      */
     protected function performAuthentication($username, $password)
     {
-        $request  = pack('C2', 1, strlen($username)) . $username
+        $request = pack('C2', 1, strlen($username)) . $username
                     . pack('C', strlen($password)) . $password;
 
         $this->write($request);

Please login to merge, or discard this patch.

libs/PEAR.1.9.5/HTTP/Request2/SocketWrapper.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -170,7 +170,7 @@
 block discarded – undo
                 // reset socket timeout if we don't have request timeout specified,
                 // prevents further calls failing with a bogus Exception
                 if (!$this->deadline) {
-                    $default = (int)@ini_get('default_socket_timeout');
+                    $default = (int) @ini_get('default_socket_timeout');
                     stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
                 }
                 if ($info['timed_out']) {

Please login to merge, or discard this patch.

Indentation +238 added lines, -238 removed lines patch added patch discarded remove patch

@@ -38,260 +38,260 @@
 block discarded – undo
  */
 class HTTP_Request2_SocketWrapper
 {
-    /**
-     * PHP warning messages raised during stream_socket_client() call
-     * @var array
-     */
-    protected $connectionWarnings = array();
+	/**
+	 * PHP warning messages raised during stream_socket_client() call
+	 * @var array
+	 */
+	protected $connectionWarnings = array();
 
-    /**
-     * Connected socket
-     * @var resource
-     */
-    protected $socket;
+	/**
+	 * Connected socket
+	 * @var resource
+	 */
+	protected $socket;
 
-    /**
-     * Sum of start time and global timeout, exception will be thrown if request continues past this time
-     * @var  integer
-     */
-    protected $deadline;
+	/**
+	 * Sum of start time and global timeout, exception will be thrown if request continues past this time
+	 * @var  integer
+	 */
+	protected $deadline;
 
-    /**
-     * Global timeout value, mostly for exception messages
-     * @var integer
-     */
-    protected $timeout;
+	/**
+	 * Global timeout value, mostly for exception messages
+	 * @var integer
+	 */
+	protected $timeout;
 
-    /**
-     * Class constructor, tries to establish connection
-     *
-     * @param string $address        Address for stream_socket_client() call,
-     *                               e.g. 'tcp://localhost:80'
-     * @param int    $timeout        Connection timeout (seconds)
-     * @param array  $contextOptions Context options
-     *
-     * @throws HTTP_Request2_LogicException
-     * @throws HTTP_Request2_ConnectionException
-     */
-    public function __construct($address, $timeout, array $contextOptions = array())
-    {
-        if (!empty($contextOptions)
-            && !isset($contextOptions['socket']) && !isset($contextOptions['ssl'])
-        ) {
-            // Backwards compatibility with 2.1.0 and 2.1.1 releases
-            $contextOptions = array('ssl' => $contextOptions);
-        }
-        $context = stream_context_create();
-        foreach ($contextOptions as $wrapper => $options) {
-            foreach ($options as $name => $value) {
-                if (!stream_context_set_option($context, $wrapper, $name, $value)) {
-                    throw new HTTP_Request2_LogicException(
-                        "Error setting '{$wrapper}' wrapper context option '{$name}'"
-                    );
-                }
-            }
-        }
-        set_error_handler(array($this, 'connectionWarningsHandler'));
-        $this->socket = stream_socket_client(
-            $address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context
-        );
-        restore_error_handler();
-        // if we fail to bind to a specified local address (see request #19515),
-        // connection still succeeds, albeit with a warning. Throw an Exception
-        // with the warning text in this case as that connection is unlikely
-        // to be what user wants and as Curl throws an error in similar case.
-        if ($this->connectionWarnings) {
-            if ($this->socket) {
-                fclose($this->socket);
-            }
-            $error = $errstr ? $errstr : implode("\n", $this->connectionWarnings);
-            throw new HTTP_Request2_ConnectionException(
-                "Unable to connect to {$address}. Error: {$error}", 0, $errno
-            );
-        }
-    }
+	/**
+	 * Class constructor, tries to establish connection
+	 *
+	 * @param string $address        Address for stream_socket_client() call,
+	 *                               e.g. 'tcp://localhost:80'
+	 * @param int    $timeout        Connection timeout (seconds)
+	 * @param array  $contextOptions Context options
+	 *
+	 * @throws HTTP_Request2_LogicException
+	 * @throws HTTP_Request2_ConnectionException
+	 */
+	public function __construct($address, $timeout, array $contextOptions = array())
+	{
+		if (!empty($contextOptions)
+			&& !isset($contextOptions['socket']) && !isset($contextOptions['ssl'])
+		) {
+			// Backwards compatibility with 2.1.0 and 2.1.1 releases
+			$contextOptions = array('ssl' => $contextOptions);
+		}
+		$context = stream_context_create();
+		foreach ($contextOptions as $wrapper => $options) {
+			foreach ($options as $name => $value) {
+				if (!stream_context_set_option($context, $wrapper, $name, $value)) {
+					throw new HTTP_Request2_LogicException(
+						"Error setting '{$wrapper}' wrapper context option '{$name}'"
+					);
+				}
+			}
+		}
+		set_error_handler(array($this, 'connectionWarningsHandler'));
+		$this->socket = stream_socket_client(
+			$address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context
+		);
+		restore_error_handler();
+		// if we fail to bind to a specified local address (see request #19515),
+		// connection still succeeds, albeit with a warning. Throw an Exception
+		// with the warning text in this case as that connection is unlikely
+		// to be what user wants and as Curl throws an error in similar case.
+		if ($this->connectionWarnings) {
+			if ($this->socket) {
+				fclose($this->socket);
+			}
+			$error = $errstr ? $errstr : implode("\n", $this->connectionWarnings);
+			throw new HTTP_Request2_ConnectionException(
+				"Unable to connect to {$address}. Error: {$error}", 0, $errno
+			);
+		}
+	}
 
-    /**
-     * Destructor, disconnects socket
-     */
-    public function __destruct()
-    {
-        fclose($this->socket);
-    }
+	/**
+	 * Destructor, disconnects socket
+	 */
+	public function __destruct()
+	{
+		fclose($this->socket);
+	}
 
-    /**
-     * Wrapper around fread(), handles global request timeout
-     *
-     * @param int $length Reads up to this number of bytes
-     *
-     * @return   string Data read from socket
-     * @throws   HTTP_Request2_MessageException     In case of timeout
-     */
-    public function read($length)
-    {
-        if ($this->deadline) {
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-        }
-        $data = fread($this->socket, $length);
-        $this->checkTimeout();
-        return $data;
-    }
+	/**
+	 * Wrapper around fread(), handles global request timeout
+	 *
+	 * @param int $length Reads up to this number of bytes
+	 *
+	 * @return   string Data read from socket
+	 * @throws   HTTP_Request2_MessageException     In case of timeout
+	 */
+	public function read($length)
+	{
+		if ($this->deadline) {
+			stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+		}
+		$data = fread($this->socket, $length);
+		$this->checkTimeout();
+		return $data;
+	}
 
-    /**
-     * Reads until either the end of the socket or a newline, whichever comes first
-     *
-     * Strips the trailing newline from the returned data, handles global
-     * request timeout. Method idea borrowed from Net_Socket PEAR package.
-     *
-     * @param int $bufferSize   buffer size to use for reading
-     * @param int $localTimeout timeout value to use just for this call
-     *                          (used when waiting for "100 Continue" response)
-     *
-     * @return   string Available data up to the newline (not including newline)
-     * @throws   HTTP_Request2_MessageException     In case of timeout
-     */
-    public function readLine($bufferSize, $localTimeout = null)
-    {
-        $line = '';
-        while (!feof($this->socket)) {
-            if (null !== $localTimeout) {
-                stream_set_timeout($this->socket, $localTimeout);
-            } elseif ($this->deadline) {
-                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-            }
+	/**
+	 * Reads until either the end of the socket or a newline, whichever comes first
+	 *
+	 * Strips the trailing newline from the returned data, handles global
+	 * request timeout. Method idea borrowed from Net_Socket PEAR package.
+	 *
+	 * @param int $bufferSize   buffer size to use for reading
+	 * @param int $localTimeout timeout value to use just for this call
+	 *                          (used when waiting for "100 Continue" response)
+	 *
+	 * @return   string Available data up to the newline (not including newline)
+	 * @throws   HTTP_Request2_MessageException     In case of timeout
+	 */
+	public function readLine($bufferSize, $localTimeout = null)
+	{
+		$line = '';
+		while (!feof($this->socket)) {
+			if (null !== $localTimeout) {
+				stream_set_timeout($this->socket, $localTimeout);
+			} elseif ($this->deadline) {
+				stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+			}
 
-            $line .= @fgets($this->socket, $bufferSize);
+			$line .= @fgets($this->socket, $bufferSize);
 
-            if (null === $localTimeout) {
-                $this->checkTimeout();
+			if (null === $localTimeout) {
+				$this->checkTimeout();
 
-            } else {
-                $info = stream_get_meta_data($this->socket);
-                // reset socket timeout if we don't have request timeout specified,
-                // prevents further calls failing with a bogus Exception
-                if (!$this->deadline) {
-                    $default = (int)@ini_get('default_socket_timeout');
-                    stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
-                }
-                if ($info['timed_out']) {
-                    throw new HTTP_Request2_MessageException(
-                        "readLine() call timed out", HTTP_Request2_Exception::TIMEOUT
-                    );
-                }
-            }
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
+			} else {
+				$info = stream_get_meta_data($this->socket);
+				// reset socket timeout if we don't have request timeout specified,
+				// prevents further calls failing with a bogus Exception
+				if (!$this->deadline) {
+					$default = (int)@ini_get('default_socket_timeout');
+					stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
+				}
+				if ($info['timed_out']) {
+					throw new HTTP_Request2_MessageException(
+						"readLine() call timed out", HTTP_Request2_Exception::TIMEOUT
+					);
+				}
+			}
+			if (substr($line, -1) == "\n") {
+				return rtrim($line, "\r\n");
+			}
+		}
+		return $line;
+	}
 
-    /**
-     * Wrapper around fwrite(), handles global request timeout
-     *
-     * @param string $data String to be written
-     *
-     * @return int
-     * @throws HTTP_Request2_MessageException
-     */
-    public function write($data)
-    {
-        if ($this->deadline) {
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-        }
-        $written = fwrite($this->socket, $data);
-        $this->checkTimeout();
-        // http://www.php.net/manual/en/function.fwrite.php#96951
-        if ($written < strlen($data)) {
-            throw new HTTP_Request2_MessageException('Error writing request');
-        }
-        return $written;
-    }
+	/**
+	 * Wrapper around fwrite(), handles global request timeout
+	 *
+	 * @param string $data String to be written
+	 *
+	 * @return int
+	 * @throws HTTP_Request2_MessageException
+	 */
+	public function write($data)
+	{
+		if ($this->deadline) {
+			stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+		}
+		$written = fwrite($this->socket, $data);
+		$this->checkTimeout();
+		// http://www.php.net/manual/en/function.fwrite.php#96951
+		if ($written < strlen($data)) {
+			throw new HTTP_Request2_MessageException('Error writing request');
+		}
+		return $written;
+	}
 
-    /**
-     * Tests for end-of-file on a socket
-     *
-     * @return bool
-     */
-    public function eof()
-    {
-        return feof($this->socket);
-    }
+	/**
+	 * Tests for end-of-file on a socket
+	 *
+	 * @return bool
+	 */
+	public function eof()
+	{
+		return feof($this->socket);
+	}
 
-    /**
-     * Sets request deadline
-     *
-     * @param int $deadline Exception will be thrown if request continues
-     *                      past this time
-     * @param int $timeout  Original request timeout value, to use in
-     *                      Exception message
-     */
-    public function setDeadline($deadline, $timeout)
-    {
-        $this->deadline = $deadline;
-        $this->timeout  = $timeout;
-    }
+	/**
+	 * Sets request deadline
+	 *
+	 * @param int $deadline Exception will be thrown if request continues
+	 *                      past this time
+	 * @param int $timeout  Original request timeout value, to use in
+	 *                      Exception message
+	 */
+	public function setDeadline($deadline, $timeout)
+	{
+		$this->deadline = $deadline;
+		$this->timeout  = $timeout;
+	}
 
-    /**
-     * Turns on encryption on a socket
-     *
-     * @throws HTTP_Request2_ConnectionException
-     */
-    public function enableCrypto()
-    {
-        $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
-        );
+	/**
+	 * Turns on encryption on a socket
+	 *
+	 * @throws HTTP_Request2_ConnectionException
+	 */
+	public function enableCrypto()
+	{
+		$modes = array(
+			STREAM_CRYPTO_METHOD_TLS_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv2_CLIENT
+		);
 
-        foreach ($modes as $mode) {
-            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
-                return;
-            }
-        }
-        throw new HTTP_Request2_ConnectionException(
-            'Failed to enable secure connection when connecting through proxy'
-        );
-    }
+		foreach ($modes as $mode) {
+			if (stream_socket_enable_crypto($this->socket, true, $mode)) {
+				return;
+			}
+		}
+		throw new HTTP_Request2_ConnectionException(
+			'Failed to enable secure connection when connecting through proxy'
+		);
+	}
 
-    /**
-     * Throws an Exception if stream timed out
-     *
-     * @throws HTTP_Request2_MessageException
-     */
-    protected function checkTimeout()
-    {
-        $info = stream_get_meta_data($this->socket);
-        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-            $reason = $this->deadline
-                ? "after {$this->timeout} second(s)"
-                : 'due to default_socket_timeout php.ini setting';
-            throw new HTTP_Request2_MessageException(
-                "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
-            );
-        }
-    }
+	/**
+	 * Throws an Exception if stream timed out
+	 *
+	 * @throws HTTP_Request2_MessageException
+	 */
+	protected function checkTimeout()
+	{
+		$info = stream_get_meta_data($this->socket);
+		if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+			$reason = $this->deadline
+				? "after {$this->timeout} second(s)"
+				: 'due to default_socket_timeout php.ini setting';
+			throw new HTTP_Request2_MessageException(
+				"Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
+			);
+		}
+	}
 
-    /**
-     * Error handler to use during stream_socket_client() call
-     *
-     * One stream_socket_client() call may produce *multiple* PHP warnings
-     * (especially OpenSSL-related), we keep them in an array to later use for
-     * the message of HTTP_Request2_ConnectionException
-     *
-     * @param int    $errno  error level
-     * @param string $errstr error message
-     *
-     * @return bool
-     */
-    protected function connectionWarningsHandler($errno, $errstr)
-    {
-        if ($errno & E_WARNING) {
-            array_unshift($this->connectionWarnings, $errstr);
-        }
-        return true;
-    }
+	/**
+	 * Error handler to use during stream_socket_client() call
+	 *
+	 * One stream_socket_client() call may produce *multiple* PHP warnings
+	 * (especially OpenSSL-related), we keep them in an array to later use for
+	 * the message of HTTP_Request2_ConnectionException
+	 *
+	 * @param int    $errno  error level
+	 * @param string $errstr error message
+	 *
+	 * @return bool
+	 */
+	protected function connectionWarningsHandler($errno, $errstr)
+	{
+		if ($errno & E_WARNING) {
+			array_unshift($this->connectionWarnings, $errstr);
+		}
+		return true;
+	}
 }
 ?>

Please login to merge, or discard this patch.

libs/PEAR.1.9.5/PEAR.php 2 patches

Indentation +963 added lines, -963 removed lines patch added patch discarded remove patch

@@ -1,23 +1,23 @@  discard block
 block discarded – undo
 <?php
 /**
- * PEAR, the PHP Extension and Application Repository
- *
- * PEAR class and PEAR_Error class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Sterling Hughes <[email protected]>
- * @author     Stig Bakken <[email protected]>
- * @author     Tomas V.V.Cox <[email protected]>
- * @author     Greg Beaver <[email protected]>
- * @copyright  1997-2010 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
+	 * PEAR, the PHP Extension and Application Repository
+	 *
+	 * PEAR class and PEAR_Error class
+	 *
+	 * PHP versions 4 and 5
+	 *
+	 * @category   pear
+	 * @package    PEAR
+	 * @author     Sterling Hughes <[email protected]>
+	 * @author     Stig Bakken <[email protected]>
+	 * @author     Tomas V.V.Cox <[email protected]>
+	 * @author     Greg Beaver <[email protected]>
+	 * @copyright  1997-2010 The Authors
+	 * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+	 * @version    CVS: $Id$
+	 * @link       http://pear.php.net/package/PEAR
+	 * @since      File available since Release 0.1
+	 */
 
 /**#@+
  * ERROR constants
@@ -34,16 +34,16 @@  discard block
 block discarded – undo
 define('PEAR_ERROR_EXCEPTION', 32);
 /**#@-*/
 define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
+					version_compare(zend_version(), "2-dev", "ge")));
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
+	define('OS_WINDOWS', true);
+	define('OS_UNIX',    false);
+	define('PEAR_OS',    'Windows');
 } else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
+	define('OS_WINDOWS', false);
+	define('OS_UNIX',    true);
+	define('PEAR_OS',    'Unix'); // blatant assumption
 }
 
 $GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
@@ -86,694 +86,694 @@  discard block
 block discarded – undo
  */
 class PEAR
 {
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        // if we are called statically, there is a potential
-        // that no shutdown func is registered.  Bug #6445
-        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-            register_shutdown_function("_PEAR_call_destructors");
-            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    function isError($data, $code = null)
-    {
-        if (!is_a($data, 'PEAR_Error')) {
-            return false;
-        }
-
-        if (is_null($code)) {
-            return true;
-        } elseif (is_string($code)) {
-            return $data->getMessage() == $code;
-        }
-
-        return $data->getCode() == $code;
-    }
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return count($this->_expected_errors);
-    }
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-        foreach ($this->_expected_errors as $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-
-        return $deleted;
-    }
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here; we walk through it trying
-            // to unset all values
-            foreach ($error_code as $key => $error) {
-                $deleted =  $this->_checkDelExpect($error) ? true : false;
-            }
-
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            }
-
-            return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        }
-
-        // $error_code is empty
-        return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-    }
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function &raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (
-            isset($this) &&
-            isset($this->_expected_errors) &&
-            count($this->_expected_errors) > 0 &&
-            count($exp = end($this->_expected_errors))
-        ) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))
-            ) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-
-        if (intval(PHP_VERSION) < 5) {
-            // little non-eval hack to fix bug #12147
-            include 'PEAR/FixPHP5PEARWarnings.php';
-            return $a;
-        }
-
-        if ($skipmsg) {
-            $a = new $ec($code, $mode, $options, $userinfo);
-        } else {
-            $a = new $ec($message, $code, $mode, $options, $userinfo);
-        }
-
-        return $a;
-    }
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::raiseError
-     */
-    function &throwError($message = null, $code = null, $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        }
-
-        $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-        return $a;
-    }
-
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack       = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    /**
-    * OS independent PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (extension_loaded($ext)) {
-            return true;
-        }
-
-        // if either returns true dl() will produce a FATAL error, stop that
-        if (
-            function_exists('dl') === false ||
-            ini_get('enable_dl') != 1 ||
-            ini_get('safe_mode') == 1
-        ) {
-            return false;
-        }
-
-        if (OS_WINDOWS) {
-            $suffix = '.dll';
-        } elseif (PHP_OS == 'HP-UX') {
-            $suffix = '.sl';
-        } elseif (PHP_OS == 'AIX') {
-            $suffix = '.a';
-        } elseif (PHP_OS == 'OSX') {
-            $suffix = '.bundle';
-        } else {
-            $suffix = '.so';
-        }
-
-        return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-    }
+	/**
+	 * Whether to enable internal debug messages.
+	 *
+	 * @var     bool
+	 * @access  private
+	 */
+	var $_debug = false;
+
+	/**
+	 * Default error mode for this object.
+	 *
+	 * @var     int
+	 * @access  private
+	 */
+	var $_default_error_mode = null;
+
+	/**
+	 * Default error options used for this object when error mode
+	 * is PEAR_ERROR_TRIGGER.
+	 *
+	 * @var     int
+	 * @access  private
+	 */
+	var $_default_error_options = null;
+
+	/**
+	 * Default error handler (callback) for this object, if error mode is
+	 * PEAR_ERROR_CALLBACK.
+	 *
+	 * @var     string
+	 * @access  private
+	 */
+	var $_default_error_handler = '';
+
+	/**
+	 * Which class to use for error objects.
+	 *
+	 * @var     string
+	 * @access  private
+	 */
+	var $_error_class = 'PEAR_Error';
+
+	/**
+	 * An array of expected errors.
+	 *
+	 * @var     array
+	 * @access  private
+	 */
+	var $_expected_errors = array();
+
+	/**
+	 * Constructor.  Registers this object in
+	 * $_PEAR_destructor_object_list for destructor emulation if a
+	 * destructor object exists.
+	 *
+	 * @param string $error_class  (optional) which class to use for
+	 *        error objects, defaults to PEAR_Error.
+	 * @access public
+	 * @return void
+	 */
+	function PEAR($error_class = null)
+	{
+		$classname = strtolower(get_class($this));
+		if ($this->_debug) {
+			print "PEAR constructor called, class=$classname\n";
+		}
+
+		if ($error_class !== null) {
+			$this->_error_class = $error_class;
+		}
+
+		while ($classname && strcasecmp($classname, "pear")) {
+			$destructor = "_$classname";
+			if (method_exists($this, $destructor)) {
+				global $_PEAR_destructor_object_list;
+				$_PEAR_destructor_object_list[] = &$this;
+				if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+					register_shutdown_function("_PEAR_call_destructors");
+					$GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+				}
+				break;
+			} else {
+				$classname = get_parent_class($classname);
+			}
+		}
+	}
+
+	/**
+	 * Destructor (the emulated type of...).  Does nothing right now,
+	 * but is included for forward compatibility, so subclass
+	 * destructors should always call it.
+	 *
+	 * See the note in the class desciption about output from
+	 * destructors.
+	 *
+	 * @access public
+	 * @return void
+	 */
+	function _PEAR() {
+		if ($this->_debug) {
+			printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
+		}
+	}
+
+	/**
+	 * If you have a class that's mostly/entirely static, and you need static
+	 * properties, you can use this method to simulate them. Eg. in your method(s)
+	 * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
+	 * You MUST use a reference, or they will not persist!
+	 *
+	 * @access public
+	 * @param  string $class  The calling classname, to prevent clashes
+	 * @param  string $var    The variable to retrieve.
+	 * @return mixed   A reference to the variable. If not set it will be
+	 *                 auto initialised to NULL.
+	 */
+	function &getStaticProperty($class, $var)
+	{
+		static $properties;
+		if (!isset($properties[$class])) {
+			$properties[$class] = array();
+		}
+
+		if (!array_key_exists($var, $properties[$class])) {
+			$properties[$class][$var] = null;
+		}
+
+		return $properties[$class][$var];
+	}
+
+	/**
+	 * Use this function to register a shutdown method for static
+	 * classes.
+	 *
+	 * @access public
+	 * @param  mixed $func  The function name (or array of class/method) to call
+	 * @param  mixed $args  The arguments to pass to the function
+	 * @return void
+	 */
+	function registerShutdownFunc($func, $args = array())
+	{
+		// if we are called statically, there is a potential
+		// that no shutdown func is registered.  Bug #6445
+		if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+			register_shutdown_function("_PEAR_call_destructors");
+			$GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+		}
+		$GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
+	}
+
+	/**
+	 * Tell whether a value is a PEAR error.
+	 *
+	 * @param   mixed $data   the value to test
+	 * @param   int   $code   if $data is an error object, return true
+	 *                        only if $code is a string and
+	 *                        $obj->getMessage() == $code or
+	 *                        $code is an integer and $obj->getCode() == $code
+	 * @access  public
+	 * @return  bool    true if parameter is an error
+	 */
+	function isError($data, $code = null)
+	{
+		if (!is_a($data, 'PEAR_Error')) {
+			return false;
+		}
+
+		if (is_null($code)) {
+			return true;
+		} elseif (is_string($code)) {
+			return $data->getMessage() == $code;
+		}
+
+		return $data->getCode() == $code;
+	}
+
+	/**
+	 * Sets how errors generated by this object should be handled.
+	 * Can be invoked both in objects and statically.  If called
+	 * statically, setErrorHandling sets the default behaviour for all
+	 * PEAR objects.  If called in an object, setErrorHandling sets
+	 * the default behaviour for that object.
+	 *
+	 * @param int $mode
+	 *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+	 *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+	 *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
+	 *
+	 * @param mixed $options
+	 *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
+	 *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+	 *
+	 *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
+	 *        to be the callback function or method.  A callback
+	 *        function is a string with the name of the function, a
+	 *        callback method is an array of two elements: the element
+	 *        at index 0 is the object, and the element at index 1 is
+	 *        the name of the method to call in the object.
+	 *
+	 *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
+	 *        a printf format string used when printing the error
+	 *        message.
+	 *
+	 * @access public
+	 * @return void
+	 * @see PEAR_ERROR_RETURN
+	 * @see PEAR_ERROR_PRINT
+	 * @see PEAR_ERROR_TRIGGER
+	 * @see PEAR_ERROR_DIE
+	 * @see PEAR_ERROR_CALLBACK
+	 * @see PEAR_ERROR_EXCEPTION
+	 *
+	 * @since PHP 4.0.5
+	 */
+	function setErrorHandling($mode = null, $options = null)
+	{
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$setmode     = &$this->_default_error_mode;
+			$setoptions  = &$this->_default_error_options;
+		} else {
+			$setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+			$setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+		}
+
+		switch ($mode) {
+			case PEAR_ERROR_EXCEPTION:
+			case PEAR_ERROR_RETURN:
+			case PEAR_ERROR_PRINT:
+			case PEAR_ERROR_TRIGGER:
+			case PEAR_ERROR_DIE:
+			case null:
+				$setmode = $mode;
+				$setoptions = $options;
+				break;
+
+			case PEAR_ERROR_CALLBACK:
+				$setmode = $mode;
+				// class/object method callback
+				if (is_callable($options)) {
+					$setoptions = $options;
+				} else {
+					trigger_error("invalid error callback", E_USER_WARNING);
+				}
+				break;
+
+			default:
+				trigger_error("invalid error mode", E_USER_WARNING);
+				break;
+		}
+	}
+
+	/**
+	 * This method is used to tell which errors you expect to get.
+	 * Expected errors are always returned with error mode
+	 * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
+	 * and this method pushes a new element onto it.  The list of
+	 * expected errors are in effect until they are popped off the
+	 * stack with the popExpect() method.
+	 *
+	 * Note that this method can not be called statically
+	 *
+	 * @param mixed $code a single error code or an array of error codes to expect
+	 *
+	 * @return int     the new depth of the "expected errors" stack
+	 * @access public
+	 */
+	function expectError($code = '*')
+	{
+		if (is_array($code)) {
+			array_push($this->_expected_errors, $code);
+		} else {
+			array_push($this->_expected_errors, array($code));
+		}
+		return count($this->_expected_errors);
+	}
+
+	/**
+	 * This method pops one element off the expected error codes
+	 * stack.
+	 *
+	 * @return array   the list of error codes that were popped
+	 */
+	function popExpect()
+	{
+		return array_pop($this->_expected_errors);
+	}
+
+	/**
+	 * This method checks unsets an error code if available
+	 *
+	 * @param mixed error code
+	 * @return bool true if the error code was unset, false otherwise
+	 * @access private
+	 * @since PHP 4.3.0
+	 */
+	function _checkDelExpect($error_code)
+	{
+		$deleted = false;
+		foreach ($this->_expected_errors as $key => $error_array) {
+			if (in_array($error_code, $error_array)) {
+				unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
+				$deleted = true;
+			}
+
+			// clean up empty arrays
+			if (0 == count($this->_expected_errors[$key])) {
+				unset($this->_expected_errors[$key]);
+			}
+		}
+
+		return $deleted;
+	}
+
+	/**
+	 * This method deletes all occurences of the specified element from
+	 * the expected error codes stack.
+	 *
+	 * @param  mixed $error_code error code that should be deleted
+	 * @return mixed list of error codes that were deleted or error
+	 * @access public
+	 * @since PHP 4.3.0
+	 */
+	function delExpect($error_code)
+	{
+		$deleted = false;
+		if ((is_array($error_code) && (0 != count($error_code)))) {
+			// $error_code is a non-empty array here; we walk through it trying
+			// to unset all values
+			foreach ($error_code as $key => $error) {
+				$deleted =  $this->_checkDelExpect($error) ? true : false;
+			}
+
+			return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+		} elseif (!empty($error_code)) {
+			// $error_code comes alone, trying to unset it
+			if ($this->_checkDelExpect($error_code)) {
+				return true;
+			}
+
+			return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+		}
+
+		// $error_code is empty
+		return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
+	}
+
+	/**
+	 * This method is a wrapper that returns an instance of the
+	 * configured error class with this object's default error
+	 * handling applied.  If the $mode and $options parameters are not
+	 * specified, the object's defaults are used.
+	 *
+	 * @param mixed $message a text error message or a PEAR error object
+	 *
+	 * @param int $code      a numeric error code (it is up to your class
+	 *                  to define these if you want to use codes)
+	 *
+	 * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+	 *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+	 *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
+	 *
+	 * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
+	 *                  specifies the PHP-internal error level (one of
+	 *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+	 *                  If $mode is PEAR_ERROR_CALLBACK, this
+	 *                  parameter specifies the callback function or
+	 *                  method.  In other error modes this parameter
+	 *                  is ignored.
+	 *
+	 * @param string $userinfo If you need to pass along for example debug
+	 *                  information, this parameter is meant for that.
+	 *
+	 * @param string $error_class The returned error object will be
+	 *                  instantiated from this class, if specified.
+	 *
+	 * @param bool $skipmsg If true, raiseError will only pass error codes,
+	 *                  the error message parameter will be dropped.
+	 *
+	 * @access public
+	 * @return object   a PEAR error object
+	 * @see PEAR::setErrorHandling
+	 * @since PHP 4.0.5
+	 */
+	function &raiseError($message = null,
+						 $code = null,
+						 $mode = null,
+						 $options = null,
+						 $userinfo = null,
+						 $error_class = null,
+						 $skipmsg = false)
+	{
+		// The error is yet a PEAR error object
+		if (is_object($message)) {
+			$code        = $message->getCode();
+			$userinfo    = $message->getUserInfo();
+			$error_class = $message->getType();
+			$message->error_message_prefix = '';
+			$message     = $message->getMessage();
+		}
+
+		if (
+			isset($this) &&
+			isset($this->_expected_errors) &&
+			count($this->_expected_errors) > 0 &&
+			count($exp = end($this->_expected_errors))
+		) {
+			if ($exp[0] == "*" ||
+				(is_int(reset($exp)) && in_array($code, $exp)) ||
+				(is_string(reset($exp)) && in_array($message, $exp))
+			) {
+				$mode = PEAR_ERROR_RETURN;
+			}
+		}
+
+		// No mode given, try global ones
+		if ($mode === null) {
+			// Class error handler
+			if (isset($this) && isset($this->_default_error_mode)) {
+				$mode    = $this->_default_error_mode;
+				$options = $this->_default_error_options;
+			// Global error handler
+			} elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
+				$mode    = $GLOBALS['_PEAR_default_error_mode'];
+				$options = $GLOBALS['_PEAR_default_error_options'];
+			}
+		}
+
+		if ($error_class !== null) {
+			$ec = $error_class;
+		} elseif (isset($this) && isset($this->_error_class)) {
+			$ec = $this->_error_class;
+		} else {
+			$ec = 'PEAR_Error';
+		}
+
+		if (intval(PHP_VERSION) < 5) {
+			// little non-eval hack to fix bug #12147
+			include 'PEAR/FixPHP5PEARWarnings.php';
+			return $a;
+		}
+
+		if ($skipmsg) {
+			$a = new $ec($code, $mode, $options, $userinfo);
+		} else {
+			$a = new $ec($message, $code, $mode, $options, $userinfo);
+		}
+
+		return $a;
+	}
+
+	/**
+	 * Simpler form of raiseError with fewer options.  In most cases
+	 * message, code and userinfo are enough.
+	 *
+	 * @param mixed $message a text error message or a PEAR error object
+	 *
+	 * @param int $code      a numeric error code (it is up to your class
+	 *                  to define these if you want to use codes)
+	 *
+	 * @param string $userinfo If you need to pass along for example debug
+	 *                  information, this parameter is meant for that.
+	 *
+	 * @access public
+	 * @return object   a PEAR error object
+	 * @see PEAR::raiseError
+	 */
+	function &throwError($message = null, $code = null, $userinfo = null)
+	{
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$a = &$this->raiseError($message, $code, null, null, $userinfo);
+			return $a;
+		}
+
+		$a = &PEAR::raiseError($message, $code, null, null, $userinfo);
+		return $a;
+	}
+
+	function staticPushErrorHandling($mode, $options = null)
+	{
+		$stack       = &$GLOBALS['_PEAR_error_handler_stack'];
+		$def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+		$def_options = &$GLOBALS['_PEAR_default_error_options'];
+		$stack[] = array($def_mode, $def_options);
+		switch ($mode) {
+			case PEAR_ERROR_EXCEPTION:
+			case PEAR_ERROR_RETURN:
+			case PEAR_ERROR_PRINT:
+			case PEAR_ERROR_TRIGGER:
+			case PEAR_ERROR_DIE:
+			case null:
+				$def_mode = $mode;
+				$def_options = $options;
+				break;
+
+			case PEAR_ERROR_CALLBACK:
+				$def_mode = $mode;
+				// class/object method callback
+				if (is_callable($options)) {
+					$def_options = $options;
+				} else {
+					trigger_error("invalid error callback", E_USER_WARNING);
+				}
+				break;
+
+			default:
+				trigger_error("invalid error mode", E_USER_WARNING);
+				break;
+		}
+		$stack[] = array($mode, $options);
+		return true;
+	}
+
+	function staticPopErrorHandling()
+	{
+		$stack = &$GLOBALS['_PEAR_error_handler_stack'];
+		$setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+		$setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+		array_pop($stack);
+		list($mode, $options) = $stack[sizeof($stack) - 1];
+		array_pop($stack);
+		switch ($mode) {
+			case PEAR_ERROR_EXCEPTION:
+			case PEAR_ERROR_RETURN:
+			case PEAR_ERROR_PRINT:
+			case PEAR_ERROR_TRIGGER:
+			case PEAR_ERROR_DIE:
+			case null:
+				$setmode = $mode;
+				$setoptions = $options;
+				break;
+
+			case PEAR_ERROR_CALLBACK:
+				$setmode = $mode;
+				// class/object method callback
+				if (is_callable($options)) {
+					$setoptions = $options;
+				} else {
+					trigger_error("invalid error callback", E_USER_WARNING);
+				}
+				break;
+
+			default:
+				trigger_error("invalid error mode", E_USER_WARNING);
+				break;
+		}
+		return true;
+	}
+
+	/**
+	 * Push a new error handler on top of the error handler options stack. With this
+	 * you can easily override the actual error handler for some code and restore
+	 * it later with popErrorHandling.
+	 *
+	 * @param mixed $mode (same as setErrorHandling)
+	 * @param mixed $options (same as setErrorHandling)
+	 *
+	 * @return bool Always true
+	 *
+	 * @see PEAR::setErrorHandling
+	 */
+	function pushErrorHandling($mode, $options = null)
+	{
+		$stack = &$GLOBALS['_PEAR_error_handler_stack'];
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$def_mode    = &$this->_default_error_mode;
+			$def_options = &$this->_default_error_options;
+		} else {
+			$def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+			$def_options = &$GLOBALS['_PEAR_default_error_options'];
+		}
+		$stack[] = array($def_mode, $def_options);
+
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$this->setErrorHandling($mode, $options);
+		} else {
+			PEAR::setErrorHandling($mode, $options);
+		}
+		$stack[] = array($mode, $options);
+		return true;
+	}
+
+	/**
+	 * Pop the last error handler used
+	 *
+	 * @return bool Always true
+	 *
+	 * @see PEAR::pushErrorHandling
+	 */
+	function popErrorHandling()
+	{
+		$stack = &$GLOBALS['_PEAR_error_handler_stack'];
+		array_pop($stack);
+		list($mode, $options) = $stack[sizeof($stack) - 1];
+		array_pop($stack);
+		if (isset($this) && is_a($this, 'PEAR')) {
+			$this->setErrorHandling($mode, $options);
+		} else {
+			PEAR::setErrorHandling($mode, $options);
+		}
+		return true;
+	}
+
+	/**
+	 * OS independent PHP extension load. Remember to take care
+	 * on the correct extension name for case sensitive OSes.
+	 *
+	 * @param string $ext The extension name
+	 * @return bool Success or not on the dl() call
+	 */
+	function loadExtension($ext)
+	{
+		if (extension_loaded($ext)) {
+			return true;
+		}
+
+		// if either returns true dl() will produce a FATAL error, stop that
+		if (
+			function_exists('dl') === false ||
+			ini_get('enable_dl') != 1 ||
+			ini_get('safe_mode') == 1
+		) {
+			return false;
+		}
+
+		if (OS_WINDOWS) {
+			$suffix = '.dll';
+		} elseif (PHP_OS == 'HP-UX') {
+			$suffix = '.sl';
+		} elseif (PHP_OS == 'AIX') {
+			$suffix = '.a';
+		} elseif (PHP_OS == 'OSX') {
+			$suffix = '.bundle';
+		} else {
+			$suffix = '.so';
+		}
+
+		return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+	}
 }
 
 if (PEAR_ZE2) {
-    include_once 'PEAR5.php';
+	include_once 'PEAR5.php';
 }
 
 function _PEAR_call_destructors()
 {
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (PEAR_ZE2) {
-            $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
-        } else {
-            $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
-        }
-
-        if ($destructLifoExists) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (
-        isset($GLOBALS['_PEAR_shutdown_funcs']) &&
-        is_array($GLOBALS['_PEAR_shutdown_funcs']) &&
-        !empty($GLOBALS['_PEAR_shutdown_funcs'])
-    ) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
+	global $_PEAR_destructor_object_list;
+	if (is_array($_PEAR_destructor_object_list) &&
+		sizeof($_PEAR_destructor_object_list))
+	{
+		reset($_PEAR_destructor_object_list);
+		if (PEAR_ZE2) {
+			$destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
+		} else {
+			$destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
+		}
+
+		if ($destructLifoExists) {
+			$_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
+		}
+
+		while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
+			$classname = get_class($objref);
+			while ($classname) {
+				$destructor = "_$classname";
+				if (method_exists($objref, $destructor)) {
+					$objref->$destructor();
+					break;
+				} else {
+					$classname = get_parent_class($classname);
+				}
+			}
+		}
+		// Empty the object list to ensure that destructors are
+		// not called more than once.
+		$_PEAR_destructor_object_list = array();
+	}
+
+	// Now call the shutdown functions
+	if (
+		isset($GLOBALS['_PEAR_shutdown_funcs']) &&
+		is_array($GLOBALS['_PEAR_shutdown_funcs']) &&
+		!empty($GLOBALS['_PEAR_shutdown_funcs'])
+	) {
+		foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
+			call_user_func_array($value[0], $value[1]);
+		}
+	}
 }
 
 /**
@@ -795,263 +795,263 @@  discard block
 block discarded – undo
  */
 class PEAR_Error
 {
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-
-        if (PEAR_ZE2) {
-            $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
-        } else {
-            $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
-        }
-
-        if (!$skiptrace) {
-            $this->backtrace = debug_backtrace();
-            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
-                unset($this->backtrace[0]['object']);
-            }
-        }
-
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-
-            $this->level = $options;
-            $this->callback = null;
-        }
-
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-
-            printf($format, $this->getMessage());
-        }
-
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-
-        if ($this->mode & PEAR_ERROR_CALLBACK && is_callable($this->callback)) {
-            call_user_func($this->callback, $this);
-        }
-
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);throw($e);');
-        }
-    }
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode()
-    {
-        return $this->mode;
-    }
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback()
-    {
-        return $this->callback;
-    }
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if (defined('PEAR_IGNORE_BACKTRACE')) {
-            return null;
-        }
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    function __toString()
-    {
-        return $this->getMessage();
-    }
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString()
-    {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
+	var $error_message_prefix = '';
+	var $mode                 = PEAR_ERROR_RETURN;
+	var $level                = E_USER_NOTICE;
+	var $code                 = -1;
+	var $message              = '';
+	var $userinfo             = '';
+	var $backtrace            = null;
+
+	/**
+	 * PEAR_Error constructor
+	 *
+	 * @param string $message  message
+	 *
+	 * @param int $code     (optional) error code
+	 *
+	 * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
+	 * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
+	 * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
+	 *
+	 * @param mixed $options   (optional) error level, _OR_ in the case of
+	 * PEAR_ERROR_CALLBACK, the callback function or object/method
+	 * tuple.
+	 *
+	 * @param string $userinfo (optional) additional user/debug info
+	 *
+	 * @access public
+	 *
+	 */
+	function PEAR_Error($message = 'unknown error', $code = null,
+						$mode = null, $options = null, $userinfo = null)
+	{
+		if ($mode === null) {
+			$mode = PEAR_ERROR_RETURN;
+		}
+		$this->message   = $message;
+		$this->code      = $code;
+		$this->mode      = $mode;
+		$this->userinfo  = $userinfo;
+
+		if (PEAR_ZE2) {
+			$skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
+		} else {
+			$skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
+		}
+
+		if (!$skiptrace) {
+			$this->backtrace = debug_backtrace();
+			if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
+				unset($this->backtrace[0]['object']);
+			}
+		}
+
+		if ($mode & PEAR_ERROR_CALLBACK) {
+			$this->level = E_USER_NOTICE;
+			$this->callback = $options;
+		} else {
+			if ($options === null) {
+				$options = E_USER_NOTICE;
+			}
+
+			$this->level = $options;
+			$this->callback = null;
+		}
+
+		if ($this->mode & PEAR_ERROR_PRINT) {
+			if (is_null($options) || is_int($options)) {
+				$format = "%s";
+			} else {
+				$format = $options;
+			}
+
+			printf($format, $this->getMessage());
+		}
+
+		if ($this->mode & PEAR_ERROR_TRIGGER) {
+			trigger_error($this->getMessage(), $this->level);
+		}
+
+		if ($this->mode & PEAR_ERROR_DIE) {
+			$msg = $this->getMessage();
+			if (is_null($options) || is_int($options)) {
+				$format = "%s";
+				if (substr($msg, -1) != "\n") {
+					$msg .= "\n";
+				}
+			} else {
+				$format = $options;
+			}
+			die(sprintf($format, $msg));
+		}
+
+		if ($this->mode & PEAR_ERROR_CALLBACK && is_callable($this->callback)) {
+			call_user_func($this->callback, $this);
+		}
+
+		if ($this->mode & PEAR_ERROR_EXCEPTION) {
+			trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
+			eval('$e = new Exception($this->message, $this->code);throw($e);');
+		}
+	}
+
+	/**
+	 * Get the error mode from an error object.
+	 *
+	 * @return int error mode
+	 * @access public
+	 */
+	function getMode()
+	{
+		return $this->mode;
+	}
+
+	/**
+	 * Get the callback function/method from an error object.
+	 *
+	 * @return mixed callback function or object/method array
+	 * @access public
+	 */
+	function getCallback()
+	{
+		return $this->callback;
+	}
+
+	/**
+	 * Get the error message from an error object.
+	 *
+	 * @return  string  full error message
+	 * @access public
+	 */
+	function getMessage()
+	{
+		return ($this->error_message_prefix . $this->message);
+	}
+
+	/**
+	 * Get error code from an error object
+	 *
+	 * @return int error code
+	 * @access public
+	 */
+	 function getCode()
+	 {
+		return $this->code;
+	 }
+
+	/**
+	 * Get the name of this error/exception.
+	 *
+	 * @return string error/exception name (type)
+	 * @access public
+	 */
+	function getType()
+	{
+		return get_class($this);
+	}
+
+	/**
+	 * Get additional user-supplied information.
+	 *
+	 * @return string user-supplied information
+	 * @access public
+	 */
+	function getUserInfo()
+	{
+		return $this->userinfo;
+	}
+
+	/**
+	 * Get additional debug information supplied by the application.
+	 *
+	 * @return string debug information
+	 * @access public
+	 */
+	function getDebugInfo()
+	{
+		return $this->getUserInfo();
+	}
+
+	/**
+	 * Get the call backtrace from where the error was generated.
+	 * Supported with PHP 4.3.0 or newer.
+	 *
+	 * @param int $frame (optional) what frame to fetch
+	 * @return array Backtrace, or NULL if not available.
+	 * @access public
+	 */
+	function getBacktrace($frame = null)
+	{
+		if (defined('PEAR_IGNORE_BACKTRACE')) {
+			return null;
+		}
+		if ($frame === null) {
+			return $this->backtrace;
+		}
+		return $this->backtrace[$frame];
+	}
+
+	function addUserInfo($info)
+	{
+		if (empty($this->userinfo)) {
+			$this->userinfo = $info;
+		} else {
+			$this->userinfo .= " ** $info";
+		}
+	}
+
+	function __toString()
+	{
+		return $this->getMessage();
+	}
+
+	/**
+	 * Make a string representation of this object.
+	 *
+	 * @return string a string with an object summary
+	 * @access public
+	 */
+	function toString()
+	{
+		$modes = array();
+		$levels = array(E_USER_NOTICE  => 'notice',
+						E_USER_WARNING => 'warning',
+						E_USER_ERROR   => 'error');
+		if ($this->mode & PEAR_ERROR_CALLBACK) {
+			if (is_array($this->callback)) {
+				$callback = (is_object($this->callback[0]) ?
+					strtolower(get_class($this->callback[0])) :
+					$this->callback[0]) . '::' .
+					$this->callback[1];
+			} else {
+				$callback = $this->callback;
+			}
+			return sprintf('[%s: message="%s" code=%d mode=callback '.
+						   'callback=%s prefix="%s" info="%s"]',
+						   strtolower(get_class($this)), $this->message, $this->code,
+						   $callback, $this->error_message_prefix,
+						   $this->userinfo);
+		}
+		if ($this->mode & PEAR_ERROR_PRINT) {
+			$modes[] = 'print';
+		}
+		if ($this->mode & PEAR_ERROR_TRIGGER) {
+			$modes[] = 'trigger';
+		}
+		if ($this->mode & PEAR_ERROR_DIE) {
+			$modes[] = 'die';
+		}
+		if ($this->mode & PEAR_ERROR_RETURN) {
+			$modes[] = 'return';
+		}
+		return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
+					   'prefix="%s" info="%s"]',
+					   strtolower(get_class($this)), $this->message, $this->code,
+					   implode("|", $modes), $levels[$this->level],
+					   $this->error_message_prefix,
+					   $this->userinfo);
+	}
 }
 
 /*

Please login to merge, or discard this patch.

Spacing +14 added lines, -15 removed lines patch added patch discarded remove patch

@@ -22,11 +22,11 @@  discard block
 block discarded – undo
 /**#@+
  * ERROR constants
  */
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
+define('PEAR_ERROR_RETURN', 1);
+define('PEAR_ERROR_PRINT', 2);
+define('PEAR_ERROR_TRIGGER', 4);
+define('PEAR_ERROR_DIE', 8);
+define('PEAR_ERROR_CALLBACK', 16);
 /**
  * WARNING: obsolete
  * @deprecated
@@ -38,12 +38,12 @@  discard block
 block discarded – undo
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
+    define('OS_UNIX', false);
+    define('PEAR_OS', 'Windows');
 } else {
     define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
+    define('OS_UNIX', true);
+    define('PEAR_OS', 'Unix'); // blatant assumption
 }
 
 $GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
             // $error_code is a non-empty array here; we walk through it trying
             // to unset all values
             foreach ($error_code as $key => $error) {
-                $deleted =  $this->_checkDelExpect($error) ? true : false;
+                $deleted = $this->_checkDelExpect($error) ? true : false;
             }
 
             return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
             $suffix = '.so';
         }
 
-        return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+        return @dl('php_' . $ext . $suffix) || @dl($ext . $suffix);
     }
 }
 
@@ -1021,13 +1021,12 @@  discard block
 block discarded – undo
         if ($this->mode & PEAR_ERROR_CALLBACK) {
             if (is_array($this->callback)) {
                 $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
+                    strtolower(get_class($this->callback[0])) : $this->callback[0]) . '::' .
                     $this->callback[1];
             } else {
                 $callback = $this->callback;
             }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
+            return sprintf('[%s: message="%s" code=%d mode=callback ' .
                            'callback=%s prefix="%s" info="%s"]',
                            strtolower(get_class($this)), $this->message, $this->code,
                            $callback, $this->error_message_prefix,
@@ -1045,7 +1044,7 @@  discard block
 block discarded – undo
         if ($this->mode & PEAR_ERROR_RETURN) {
             $modes[] = 'return';
         }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
+        return sprintf('[%s: message="%s" code=%d mode=%s level=%s ' .
                        'prefix="%s" info="%s"]',
                        strtolower(get_class($this)), $this->message, $this->code,
                        implode("|", $modes), $levels[$this->level],

Please login to merge, or discard this patch.

libs/PEAR.1.9.5/PEAR/Exception.php 4 patches

Spacing +8 added lines, -10 removed lines patch added patch discarded remove patch

@@ -277,11 +277,9 @@  discard block
 block discarded – undo
                         'class' => $cause['package'],
                         'message' => $cause['message'],
                         'file' => isset($cause['context']['file']) ?
-                                            $cause['context']['file'] :
-                                            'unknown',
+                                            $cause['context']['file'] : 'unknown',
                         'line' => isset($cause['context']['line']) ?
-                                            $cause['context']['line'] :
-                                            'unknown',
+                                            $cause['context']['line'] : 'unknown',
                     );
                 }
             }
@@ -294,7 +292,7 @@  discard block
 block discarded – undo
             $this->_trace = $this->getTrace();
             if (empty($this->_trace)) {
                 $backtrace = debug_backtrace();
-                $this->_trace = array($backtrace[count($backtrace)-1]);
+                $this->_trace = array($backtrace[count($backtrace) - 1]);
             }
         }
         return $this->_trace;
@@ -325,7 +323,7 @@  discard block
 block discarded – undo
         $trace = $this->getTraceSafe();
         $causes = array();
         $this->getCauseMessage($causes);
-        $html =  '<table style="border: 1px" cellspacing="0">' . "\n";
+        $html = '<table style="border: 1px" cellspacing="0">' . "\n";
         foreach ($causes as $i => $cause) {
             $html .= '<tr><td colspan="3" style="background: #ff9999">'
                . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
@@ -350,24 +348,24 @@  discard block
 block discarded – undo
                 foreach ($v['args'] as $arg) {
                     if (is_null($arg)) $args[] = 'null';
                     elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
+                    elseif (is_object($arg)) $args[] = 'Object(' . get_class($arg) . ')';
                     elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
                     elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
                     else {
-                        $arg = (string)$arg;
+                        $arg = (string) $arg;
                         $str = htmlspecialchars(substr($arg, 0, 16));
                         if (strlen($arg) > 16) $str .= '&hellip;';
                         $args[] = "'" . $str . "'";
                     }
                 }
             }
-            $html .= '(' . implode(', ',$args) . ')'
+            $html .= '(' . implode(', ', $args) . ')'
                    . '</td>'
                    . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
                    . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
                    . '</td></tr>' . "\n";
         }
-        $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
+        $html .= '<tr><td style="text-align: center;">' . ($k + 1) . '</td>'
                . '<td>{main}</td>'
                . '<td>&nbsp;</td></tr>' . "\n"
                . '</table>';

Please login to merge, or discard this patch.

Doc Comments +2 added lines patch added patch discarded remove patch

@@ -117,6 +117,8 @@
 block discarded – undo
      * @param string exception message
      * @param int|Exception|PEAR_Error|array|null exception cause
      * @param int|null exception code or null
+     * @param string|null $message
+     * @param integer $p2
      */
     public function __construct($message, $p2 = null, $p3 = null)
     {

Please login to merge, or discard this patch.

Braces +14 added lines, -7 removed lines patch added patch discarded remove patch

@@ -348,15 +348,22 @@
 block discarded – undo
             $args = array();
             if (!empty($v['args'])) {
                 foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
+                    if (is_null($arg)) {
+                    	$args[] = 'null';
+                    } elseif (is_array($arg)) {
+                    	$args[] = 'Array';
+                    } elseif (is_object($arg)) {
+                    	$args[] = 'Object('.get_class($arg).')';
+                    } elseif (is_bool($arg)) {
+                    	$args[] = $arg ? 'true' : 'false';
+                    } elseif (is_int($arg) || is_double($arg)) {
+                    	$args[] = $arg;
+                    } else {
                         $arg = (string)$arg;
                         $str = htmlspecialchars(substr($arg, 0, 16), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-                        if (strlen($arg) > 16) $str .= '&hellip;';
+                        if (strlen($arg) > 16) {
+                        	$str .= '&hellip;';
+                        }
                         $args[] = "'" . $str . "'";
                     }
                 }

Please login to merge, or discard this patch.

Indentation +291 added lines, -291 removed lines patch added patch discarded remove patch

@@ -1,22 +1,22 @@  discard block
 block discarded – undo
 <?php
 /* vim: set expandtab tabstop=4 shiftwidth=4 foldmethod=marker: */
 /**
- * PEAR_Exception
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Tomas V. V. Cox <[email protected]>
- * @author     Hans Lellelid <[email protected]>
- * @author     Bertrand Mansion <[email protected]>
- * @author     Greg Beaver <[email protected]>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.3.3
- */
+	 * PEAR_Exception
+	 *
+	 * PHP versions 4 and 5
+	 *
+	 * @category   pear
+	 * @package    PEAR
+	 * @author     Tomas V. V. Cox <[email protected]>
+	 * @author     Hans Lellelid <[email protected]>
+	 * @author     Bertrand Mansion <[email protected]>
+	 * @author     Greg Beaver <[email protected]>
+	 * @copyright  1997-2009 The Authors
+	 * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+	 * @version    CVS: $Id$
+	 * @link       http://pear.php.net/package/PEAR
+	 * @since      File available since Release 1.3.3
+	 */
 
 
 /**
@@ -96,294 +96,294 @@  discard block
 block discarded – undo
  */
 class PEAR_Exception extends Exception
 {
-    const OBSERVER_PRINT = -2;
-    const OBSERVER_TRIGGER = -4;
-    const OBSERVER_DIE = -8;
-    protected $cause;
-    private static $_observers = array();
-    private static $_uniqueid = 0;
-    private $_trace;
+	const OBSERVER_PRINT = -2;
+	const OBSERVER_TRIGGER = -4;
+	const OBSERVER_DIE = -8;
+	protected $cause;
+	private static $_observers = array();
+	private static $_uniqueid = 0;
+	private $_trace;
 
-    /**
-     * Supported signatures:
-     *  - PEAR_Exception(string $message);
-     *  - PEAR_Exception(string $message, int $code);
-     *  - PEAR_Exception(string $message, Exception $cause);
-     *  - PEAR_Exception(string $message, Exception $cause, int $code);
-     *  - PEAR_Exception(string $message, PEAR_Error $cause);
-     *  - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
-     *  - PEAR_Exception(string $message, array $causes);
-     *  - PEAR_Exception(string $message, array $causes, int $code);
-     * @param string exception message
-     * @param int|Exception|PEAR_Error|array|null exception cause
-     * @param int|null exception code or null
-     */
-    public function __construct($message, $p2 = null, $p3 = null)
-    {
-        if (is_int($p2)) {
-            $code = $p2;
-            $this->cause = null;
-        } elseif (is_object($p2) || is_array($p2)) {
-            // using is_object allows both Exception and PEAR_Error
-            if (is_object($p2) && !($p2 instanceof Exception)) {
-                if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
-                    throw new PEAR_Exception('exception cause must be Exception, ' .
-                        'array, or PEAR_Error');
-                }
-            }
-            $code = $p3;
-            if (is_array($p2) && isset($p2['message'])) {
-                // fix potential problem of passing in a single warning
-                $p2 = array($p2);
-            }
-            $this->cause = $p2;
-        } else {
-            $code = null;
-            $this->cause = null;
-        }
-        parent::__construct($message, $code);
-        $this->signal();
-    }
+	/**
+	 * Supported signatures:
+	 *  - PEAR_Exception(string $message);
+	 *  - PEAR_Exception(string $message, int $code);
+	 *  - PEAR_Exception(string $message, Exception $cause);
+	 *  - PEAR_Exception(string $message, Exception $cause, int $code);
+	 *  - PEAR_Exception(string $message, PEAR_Error $cause);
+	 *  - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
+	 *  - PEAR_Exception(string $message, array $causes);
+	 *  - PEAR_Exception(string $message, array $causes, int $code);
+	 * @param string exception message
+	 * @param int|Exception|PEAR_Error|array|null exception cause
+	 * @param int|null exception code or null
+	 */
+	public function __construct($message, $p2 = null, $p3 = null)
+	{
+		if (is_int($p2)) {
+			$code = $p2;
+			$this->cause = null;
+		} elseif (is_object($p2) || is_array($p2)) {
+			// using is_object allows both Exception and PEAR_Error
+			if (is_object($p2) && !($p2 instanceof Exception)) {
+				if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
+					throw new PEAR_Exception('exception cause must be Exception, ' .
+						'array, or PEAR_Error');
+				}
+			}
+			$code = $p3;
+			if (is_array($p2) && isset($p2['message'])) {
+				// fix potential problem of passing in a single warning
+				$p2 = array($p2);
+			}
+			$this->cause = $p2;
+		} else {
+			$code = null;
+			$this->cause = null;
+		}
+		parent::__construct($message, $code);
+		$this->signal();
+	}
 
-    /**
-     * @param mixed $callback  - A valid php callback, see php func is_callable()
-     *                         - A PEAR_Exception::OBSERVER_* constant
-     *                         - An array(const PEAR_Exception::OBSERVER_*,
-     *                           mixed $options)
-     * @param string $label    The name of the observer. Use this if you want
-     *                         to remove it later with removeObserver()
-     */
-    public static function addObserver($callback, $label = 'default')
-    {
-        self::$_observers[$label] = $callback;
-    }
+	/**
+	 * @param mixed $callback  - A valid php callback, see php func is_callable()
+	 *                         - A PEAR_Exception::OBSERVER_* constant
+	 *                         - An array(const PEAR_Exception::OBSERVER_*,
+	 *                           mixed $options)
+	 * @param string $label    The name of the observer. Use this if you want
+	 *                         to remove it later with removeObserver()
+	 */
+	public static function addObserver($callback, $label = 'default')
+	{
+		self::$_observers[$label] = $callback;
+	}
 
-    public static function removeObserver($label = 'default')
-    {
-        unset(self::$_observers[$label]);
-    }
+	public static function removeObserver($label = 'default')
+	{
+		unset(self::$_observers[$label]);
+	}
 
-    /**
-     * @return int unique identifier for an observer
-     */
-    public static function getUniqueId()
-    {
-        return self::$_uniqueid++;
-    }
+	/**
+	 * @return int unique identifier for an observer
+	 */
+	public static function getUniqueId()
+	{
+		return self::$_uniqueid++;
+	}
 
-    private function signal()
-    {
-        foreach (self::$_observers as $func) {
-            if (is_callable($func)) {
-                call_user_func($func, $this);
-                continue;
-            }
-            settype($func, 'array');
-            switch ($func[0]) {
-                case self::OBSERVER_PRINT :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    printf($f, $this->getMessage());
-                    break;
-                case self::OBSERVER_TRIGGER :
-                    $f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
-                    trigger_error($this->getMessage(), $f);
-                    break;
-                case self::OBSERVER_DIE :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    die(printf($f, $this->getMessage()));
-                    break;
-                default:
-                    trigger_error('invalid observer type', E_USER_WARNING);
-            }
-        }
-    }
+	private function signal()
+	{
+		foreach (self::$_observers as $func) {
+			if (is_callable($func)) {
+				call_user_func($func, $this);
+				continue;
+			}
+			settype($func, 'array');
+			switch ($func[0]) {
+				case self::OBSERVER_PRINT :
+					$f = (isset($func[1])) ? $func[1] : '%s';
+					printf($f, $this->getMessage());
+					break;
+				case self::OBSERVER_TRIGGER :
+					$f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
+					trigger_error($this->getMessage(), $f);
+					break;
+				case self::OBSERVER_DIE :
+					$f = (isset($func[1])) ? $func[1] : '%s';
+					die(printf($f, $this->getMessage()));
+					break;
+				default:
+					trigger_error('invalid observer type', E_USER_WARNING);
+			}
+		}
+	}
 
-    /**
-     * Return specific error information that can be used for more detailed
-     * error messages or translation.
-     *
-     * This method may be overridden in child exception classes in order
-     * to add functionality not present in PEAR_Exception and is a placeholder
-     * to define API
-     *
-     * The returned array must be an associative array of parameter => value like so:
-     * <pre>
-     * array('name' => $name, 'context' => array(...))
-     * </pre>
-     * @return array
-     */
-    public function getErrorData()
-    {
-        return array();
-    }
+	/**
+	 * Return specific error information that can be used for more detailed
+	 * error messages or translation.
+	 *
+	 * This method may be overridden in child exception classes in order
+	 * to add functionality not present in PEAR_Exception and is a placeholder
+	 * to define API
+	 *
+	 * The returned array must be an associative array of parameter => value like so:
+	 * <pre>
+	 * array('name' => $name, 'context' => array(...))
+	 * </pre>
+	 * @return array
+	 */
+	public function getErrorData()
+	{
+		return array();
+	}
 
-    /**
-     * Returns the exception that caused this exception to be thrown
-     * @access public
-     * @return Exception|array The context of the exception
-     */
-    public function getCause()
-    {
-        return $this->cause;
-    }
+	/**
+	 * Returns the exception that caused this exception to be thrown
+	 * @access public
+	 * @return Exception|array The context of the exception
+	 */
+	public function getCause()
+	{
+		return $this->cause;
+	}
 
-    /**
-     * Function must be public to call on caused exceptions
-     * @param array
-     */
-    public function getCauseMessage(&$causes)
-    {
-        $trace = $this->getTraceSafe();
-        $cause = array('class'   => get_class($this),
-                       'message' => $this->message,
-                       'file' => 'unknown',
-                       'line' => 'unknown');
-        if (isset($trace[0])) {
-            if (isset($trace[0]['file'])) {
-                $cause['file'] = $trace[0]['file'];
-                $cause['line'] = $trace[0]['line'];
-            }
-        }
-        $causes[] = $cause;
-        if ($this->cause instanceof PEAR_Exception) {
-            $this->cause->getCauseMessage($causes);
-        } elseif ($this->cause instanceof Exception) {
-            $causes[] = array('class'   => get_class($this->cause),
-                              'message' => $this->cause->getMessage(),
-                              'file' => $this->cause->getFile(),
-                              'line' => $this->cause->getLine());
-        } elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
-            $causes[] = array('class' => get_class($this->cause),
-                              'message' => $this->cause->getMessage(),
-                              'file' => 'unknown',
-                              'line' => 'unknown');
-        } elseif (is_array($this->cause)) {
-            foreach ($this->cause as $cause) {
-                if ($cause instanceof PEAR_Exception) {
-                    $cause->getCauseMessage($causes);
-                } elseif ($cause instanceof Exception) {
-                    $causes[] = array('class'   => get_class($cause),
-                                   'message' => $cause->getMessage(),
-                                   'file' => $cause->getFile(),
-                                   'line' => $cause->getLine());
-                } elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
-                    $causes[] = array('class' => get_class($cause),
-                                      'message' => $cause->getMessage(),
-                                      'file' => 'unknown',
-                                      'line' => 'unknown');
-                } elseif (is_array($cause) && isset($cause['message'])) {
-                    // PEAR_ErrorStack warning
-                    $causes[] = array(
-                        'class' => $cause['package'],
-                        'message' => $cause['message'],
-                        'file' => isset($cause['context']['file']) ?
-                                            $cause['context']['file'] :
-                                            'unknown',
-                        'line' => isset($cause['context']['line']) ?
-                                            $cause['context']['line'] :
-                                            'unknown',
-                    );
-                }
-            }
-        }
-    }
+	/**
+	 * Function must be public to call on caused exceptions
+	 * @param array
+	 */
+	public function getCauseMessage(&$causes)
+	{
+		$trace = $this->getTraceSafe();
+		$cause = array('class'   => get_class($this),
+					   'message' => $this->message,
+					   'file' => 'unknown',
+					   'line' => 'unknown');
+		if (isset($trace[0])) {
+			if (isset($trace[0]['file'])) {
+				$cause['file'] = $trace[0]['file'];
+				$cause['line'] = $trace[0]['line'];
+			}
+		}
+		$causes[] = $cause;
+		if ($this->cause instanceof PEAR_Exception) {
+			$this->cause->getCauseMessage($causes);
+		} elseif ($this->cause instanceof Exception) {
+			$causes[] = array('class'   => get_class($this->cause),
+							  'message' => $this->cause->getMessage(),
+							  'file' => $this->cause->getFile(),
+							  'line' => $this->cause->getLine());
+		} elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
+			$causes[] = array('class' => get_class($this->cause),
+							  'message' => $this->cause->getMessage(),
+							  'file' => 'unknown',
+							  'line' => 'unknown');
+		} elseif (is_array($this->cause)) {
+			foreach ($this->cause as $cause) {
+				if ($cause instanceof PEAR_Exception) {
+					$cause->getCauseMessage($causes);
+				} elseif ($cause instanceof Exception) {
+					$causes[] = array('class'   => get_class($cause),
+								   'message' => $cause->getMessage(),
+								   'file' => $cause->getFile(),
+								   'line' => $cause->getLine());
+				} elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
+					$causes[] = array('class' => get_class($cause),
+									  'message' => $cause->getMessage(),
+									  'file' => 'unknown',
+									  'line' => 'unknown');
+				} elseif (is_array($cause) && isset($cause['message'])) {
+					// PEAR_ErrorStack warning
+					$causes[] = array(
+						'class' => $cause['package'],
+						'message' => $cause['message'],
+						'file' => isset($cause['context']['file']) ?
+											$cause['context']['file'] :
+											'unknown',
+						'line' => isset($cause['context']['line']) ?
+											$cause['context']['line'] :
+											'unknown',
+					);
+				}
+			}
+		}
+	}
 
-    public function getTraceSafe()
-    {
-        if (!isset($this->_trace)) {
-            $this->_trace = $this->getTrace();
-            if (empty($this->_trace)) {
-                $backtrace = debug_backtrace();
-                $this->_trace = array($backtrace[count($backtrace)-1]);
-            }
-        }
-        return $this->_trace;
-    }
+	public function getTraceSafe()
+	{
+		if (!isset($this->_trace)) {
+			$this->_trace = $this->getTrace();
+			if (empty($this->_trace)) {
+				$backtrace = debug_backtrace();
+				$this->_trace = array($backtrace[count($backtrace)-1]);
+			}
+		}
+		return $this->_trace;
+	}
 
-    public function getErrorClass()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['class'];
-    }
+	public function getErrorClass()
+	{
+		$trace = $this->getTraceSafe();
+		return $trace[0]['class'];
+	}
 
-    public function getErrorMethod()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['function'];
-    }
+	public function getErrorMethod()
+	{
+		$trace = $this->getTraceSafe();
+		return $trace[0]['function'];
+	}
 
-    public function __toString()
-    {
-        if (isset($_SERVER['REQUEST_URI'])) {
-            return $this->toHtml();
-        }
-        return $this->toText();
-    }
+	public function __toString()
+	{
+		if (isset($_SERVER['REQUEST_URI'])) {
+			return $this->toHtml();
+		}
+		return $this->toText();
+	}
 
-    public function toHtml()
-    {
-        $trace = $this->getTraceSafe();
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $html =  '<table style="border: 1px" cellspacing="0">' . "\n";
-        foreach ($causes as $i => $cause) {
-            $html .= '<tr><td colspan="3" style="background: #ff9999">'
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
-               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
-               . 'on line <b>' . $cause['line'] . '</b>'
-               . "</td></tr>\n";
-        }
-        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
-               . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
+	public function toHtml()
+	{
+		$trace = $this->getTraceSafe();
+		$causes = array();
+		$this->getCauseMessage($causes);
+		$html =  '<table style="border: 1px" cellspacing="0">' . "\n";
+		foreach ($causes as $i => $cause) {
+			$html .= '<tr><td colspan="3" style="background: #ff9999">'
+			   . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
+			   . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
+			   . 'on line <b>' . $cause['line'] . '</b>'
+			   . "</td></tr>\n";
+		}
+		$html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
+			   . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
+			   . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
+			   . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
 
-        foreach ($trace as $k => $v) {
-            $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
-                   . '<td>';
-            if (!empty($v['class'])) {
-                $html .= $v['class'] . $v['type'];
-            }
-            $html .= $v['function'];
-            $args = array();
-            if (!empty($v['args'])) {
-                foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
-                        $arg = (string)$arg;
-                        $str = htmlspecialchars(substr($arg, 0, 16));
-                        if (strlen($arg) > 16) $str .= '&hellip;';
-                        $args[] = "'" . $str . "'";
-                    }
-                }
-            }
-            $html .= '(' . implode(', ',$args) . ')'
-                   . '</td>'
-                   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
-                   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
-                   . '</td></tr>' . "\n";
-        }
-        $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
-               . '<td>{main}</td>'
-               . '<td>&nbsp;</td></tr>' . "\n"
-               . '</table>';
-        return $html;
-    }
+		foreach ($trace as $k => $v) {
+			$html .= '<tr><td style="text-align: center;">' . $k . '</td>'
+				   . '<td>';
+			if (!empty($v['class'])) {
+				$html .= $v['class'] . $v['type'];
+			}
+			$html .= $v['function'];
+			$args = array();
+			if (!empty($v['args'])) {
+				foreach ($v['args'] as $arg) {
+					if (is_null($arg)) $args[] = 'null';
+					elseif (is_array($arg)) $args[] = 'Array';
+					elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
+					elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
+					elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
+					else {
+						$arg = (string)$arg;
+						$str = htmlspecialchars(substr($arg, 0, 16));
+						if (strlen($arg) > 16) $str .= '&hellip;';
+						$args[] = "'" . $str . "'";
+					}
+				}
+			}
+			$html .= '(' . implode(', ',$args) . ')'
+				   . '</td>'
+				   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
+				   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
+				   . '</td></tr>' . "\n";
+		}
+		$html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
+			   . '<td>{main}</td>'
+			   . '<td>&nbsp;</td></tr>' . "\n"
+			   . '</table>';
+		return $html;
+	}
 
-    public function toText()
-    {
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $causeMsg = '';
-        foreach ($causes as $i => $cause) {
-            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
-                   . $cause['message'] . ' in ' . $cause['file']
-                   . ' on line ' . $cause['line'] . "\n";
-        }
-        return $causeMsg . $this->getTraceAsString();
-    }
+	public function toText()
+	{
+		$causes = array();
+		$this->getCauseMessage($causes);
+		$causeMsg = '';
+		foreach ($causes as $i => $cause) {
+			$causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
+				   . $cause['message'] . ' in ' . $cause['file']
+				   . ' on line ' . $cause['line'] . "\n";
+		}
+		return $causeMsg . $this->getTraceAsString();
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

libs/PEAR.1.9/HTTP/Request.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -18,28 +18,28 @@
 block discarded – undo
 	}
 
 	public function getResponseCode() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getStatus();
 		}
 	}
 
 	public function getResponseHeader() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getHeader();	
 		}
 	}
 
 	public function getResponseBody() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getBody();
 		}
 	}
 
 	public function getResponseCookies() {
-		if($this->response)
+		if ($this->response)
 		{
 			return $this->response->getCookies();
 		}

Please login to merge, or discard this patch.

libs/PEAR.1.9/HTTP/Request2/Adapter.php 1 patch

Indentation +81 added lines, -81 removed lines patch added patch discarded remove patch

@@ -1,45 +1,45 @@  discard block
 block discarded – undo
 <?php
 /**
- * Base class for HTTP_Request2 adapters
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <[email protected]>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <[email protected]>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Adapter.php 291118 2009-11-21 17:58:23Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
+	 * Base class for HTTP_Request2 adapters
+	 *
+	 * PHP version 5
+	 *
+	 * LICENSE:
+	 *
+	 * Copyright (c) 2008, 2009, Alexey Borzov <[email protected]>
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions
+	 * are met:
+	 *
+	 *    * Redistributions of source code must retain the above copyright
+	 *      notice, this list of conditions and the following disclaimer.
+	 *    * Redistributions in binary form must reproduce the above copyright
+	 *      notice, this list of conditions and the following disclaimer in the
+	 *      documentation and/or other materials provided with the distribution.
+	 *    * The names of the authors may not be used to endorse or promote products
+	 *      derived from this software without specific prior written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+	 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+	 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+	 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+	 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+	 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+	 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+	 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @category   HTTP
+	 * @package    HTTP_Request2
+	 * @author     Alexey Borzov <[email protected]>
+	 * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+	 * @version    SVN: $Id: Adapter.php 291118 2009-11-21 17:58:23Z avb $
+	 * @link       http://pear.php.net/package/HTTP_Request2
+	 */
 
 /**
  * Class representing a HTTP response
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
     * A list of methods that MUST NOT have a request body, per RFC 2616
     * @var  array
     */
-    protected static $bodyDisallowed = array('TRACE');
+	protected static $bodyDisallowed = array('TRACE');
 
    /**
     * Methods having defined semantics for request body
@@ -76,26 +76,26 @@  discard block
 block discarded – undo
     * @link http://pear.php.net/bugs/bug.php?id=12900
     * @link http://pear.php.net/bugs/bug.php?id=14740
     */
-    protected static $bodyRequired = array('POST', 'PUT');
+	protected static $bodyRequired = array('POST', 'PUT');
 
    /**
     * Request being sent
     * @var  HTTP_Request2
     */
-    protected $request;
+	protected $request;
 
    /**
     * Request body
     * @var  string|resource|HTTP_Request2_MultipartBody
     * @see  HTTP_Request2::getBody()
     */
-    protected $requestBody;
+	protected $requestBody;
 
    /**
     * Length of the request body
     * @var  integer
     */
-    protected $contentLength;
+	protected $contentLength;
 
    /**
     * Sends request to the remote server and returns its response
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    abstract public function sendRequest(HTTP_Request2 $request);
+	abstract public function sendRequest(HTTP_Request2 $request);
 
    /**
     * Calculates length of the request body, adds proper headers
@@ -113,42 +113,42 @@  discard block
 block discarded – undo
     *                   add proper 'Content-Length' and 'Content-Type' headers
     *                   to this array (or remove them if not needed)
     */
-    protected function calculateRequestLength(&$headers)
-    {
-        $this->requestBody = $this->request->getBody();
+	protected function calculateRequestLength(&$headers)
+	{
+		$this->requestBody = $this->request->getBody();
 
-        if (is_string($this->requestBody)) {
-            $this->contentLength = strlen($this->requestBody);
-        } elseif (is_resource($this->requestBody)) {
-            $stat = fstat($this->requestBody);
-            $this->contentLength = $stat['size'];
-            rewind($this->requestBody);
-        } else {
-            $this->contentLength = $this->requestBody->getLength();
-            $headers['content-type'] = 'multipart/form-data; boundary=' .
-                                       $this->requestBody->getBoundary();
-            $this->requestBody->rewind();
-        }
+		if (is_string($this->requestBody)) {
+			$this->contentLength = strlen($this->requestBody);
+		} elseif (is_resource($this->requestBody)) {
+			$stat = fstat($this->requestBody);
+			$this->contentLength = $stat['size'];
+			rewind($this->requestBody);
+		} else {
+			$this->contentLength = $this->requestBody->getLength();
+			$headers['content-type'] = 'multipart/form-data; boundary=' .
+									   $this->requestBody->getBoundary();
+			$this->requestBody->rewind();
+		}
 
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            // No body: send a Content-Length header nonetheless (request #12900),
-            // but do that only for methods that require a body (bug #14740)
-            if (in_array($this->request->getMethod(), self::$bodyRequired)) {
-                $headers['content-length'] = 0;
-            } else {
-                unset($headers['content-length']);
-                // if the method doesn't require a body and doesn't have a
-                // body, don't send a Content-Type header. (request #16799)
-                unset($headers['content-type']);
-            }
-        } else {
-            if (empty($headers['content-type'])) {
-                $headers['content-type'] = 'application/x-www-form-urlencoded';
-            }
-            $headers['content-length'] = $this->contentLength;
-        }
-    }
+		if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+			0 == $this->contentLength
+		) {
+			// No body: send a Content-Length header nonetheless (request #12900),
+			// but do that only for methods that require a body (bug #14740)
+			if (in_array($this->request->getMethod(), self::$bodyRequired)) {
+				$headers['content-length'] = 0;
+			} else {
+				unset($headers['content-length']);
+				// if the method doesn't require a body and doesn't have a
+				// body, don't send a Content-Type header. (request #16799)
+				unset($headers['content-type']);
+			}
+		} else {
+			if (empty($headers['content-type'])) {
+				$headers['content-type'] = 'application/x-www-form-urlencoded';
+			}
+			$headers['content-length'] = $this->contentLength;
+		}
+	}
 }
 ?>

Please login to merge, or discard this patch.

libs/PEAR.1.9/HTTP/Request2/Adapter/Mock.php 1 patch

Indentation +97 added lines, -97 removed lines patch added patch discarded remove patch

@@ -1,45 +1,45 @@  discard block
 block discarded – undo
 <?php
 /**
- * Mock adapter intended for testing
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <[email protected]>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <[email protected]>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Mock.php 290192 2009-11-03 21:29:32Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
+	 * Mock adapter intended for testing
+	 *
+	 * PHP version 5
+	 *
+	 * LICENSE:
+	 *
+	 * Copyright (c) 2008, 2009, Alexey Borzov <[email protected]>
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions
+	 * are met:
+	 *
+	 *    * Redistributions of source code must retain the above copyright
+	 *      notice, this list of conditions and the following disclaimer.
+	 *    * Redistributions in binary form must reproduce the above copyright
+	 *      notice, this list of conditions and the following disclaimer in the
+	 *      documentation and/or other materials provided with the distribution.
+	 *    * The names of the authors may not be used to endorse or promote products
+	 *      derived from this software without specific prior written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+	 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+	 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+	 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+	 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+	 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+	 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+	 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @category   HTTP
+	 * @package    HTTP_Request2
+	 * @author     Alexey Borzov <[email protected]>
+	 * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+	 * @version    SVN: $Id: Mock.php 290192 2009-11-03 21:29:32Z avb $
+	 * @link       http://pear.php.net/package/HTTP_Request2
+	 */
 
 /**
  * Base class for HTTP_Request2 adapters
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
     * A queue of responses to be returned by sendRequest()
     * @var  array
     */
-    protected $responses = array();
+	protected $responses = array();
 
    /**
     * Returns the next response from the queue built by addResponse()
@@ -86,23 +86,23 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2_Response
     * @throws   Exception
     */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        if (count($this->responses) > 0) {
-            $response = array_shift($this->responses);
-            if ($response instanceof HTTP_Request2_Response) {
-                return $response;
-            } else {
-                // rethrow the exception
-                $class   = get_class($response);
-                $message = $response->getMessage();
-                $code    = $response->getCode();
-                throw new $class($message, $code);
-            }
-        } else {
-            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");
-        }
-    }
+	public function sendRequest(HTTP_Request2 $request)
+	{
+		if (count($this->responses) > 0) {
+			$response = array_shift($this->responses);
+			if ($response instanceof HTTP_Request2_Response) {
+				return $response;
+			} else {
+				// rethrow the exception
+				$class   = get_class($response);
+				$message = $response->getMessage();
+				$code    = $response->getCode();
+				throw new $class($message, $code);
+			}
+		} else {
+			return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");
+		}
+	}
 
    /**
     * Adds response to the queue
@@ -111,19 +111,19 @@  discard block
 block discarded – undo
     *                   an instance of HTTP_Request2_Response or Exception
     * @throws   HTTP_Request2_Exception
     */
-    public function addResponse($response)
-    {
-        if (is_string($response)) {
-            $response = self::createResponseFromString($response);
-        } elseif (is_resource($response)) {
-            $response = self::createResponseFromFile($response);
-        } elseif (!$response instanceof HTTP_Request2_Response &&
-                  !$response instanceof Exception
-        ) {
-            throw new HTTP_Request2_Exception('Parameter is not a valid response');
-        }
-        $this->responses[] = $response;
-    }
+	public function addResponse($response)
+	{
+		if (is_string($response)) {
+			$response = self::createResponseFromString($response);
+		} elseif (is_resource($response)) {
+			$response = self::createResponseFromFile($response);
+		} elseif (!$response instanceof HTTP_Request2_Response &&
+				  !$response instanceof Exception
+		) {
+			throw new HTTP_Request2_Exception('Parameter is not a valid response');
+		}
+		$this->responses[] = $response;
+	}
 
    /**
     * Creates a new HTTP_Request2_Response object from a string
@@ -132,20 +132,20 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    public static function createResponseFromString($str)
-    {
-        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);
-        $headerLines = explode("\n", $parts[0]);
-        $response    = new HTTP_Request2_Response(array_shift($headerLines));
-        foreach ($headerLines as $headerLine) {
-            $response->parseHeaderLine($headerLine);
-        }
-        $response->parseHeaderLine('');
-        if (isset($parts[1])) {
-            $response->appendBody($parts[1]);
-        }
-        return $response;
-    }
+	public static function createResponseFromString($str)
+	{
+		$parts       = preg_split('!(\r?\n){2}!m', $str, 2);
+		$headerLines = explode("\n", $parts[0]);
+		$response    = new HTTP_Request2_Response(array_shift($headerLines));
+		foreach ($headerLines as $headerLine) {
+			$response->parseHeaderLine($headerLine);
+		}
+		$response->parseHeaderLine('');
+		if (isset($parts[1])) {
+			$response->appendBody($parts[1]);
+		}
+		return $response;
+	}
 
    /**
     * Creates a new HTTP_Request2_Response object from a file
@@ -154,18 +154,18 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    public static function createResponseFromFile($fp)
-    {
-        $response = new HTTP_Request2_Response(fgets($fp));
-        do {
-            $headerLine = fgets($fp);
-            $response->parseHeaderLine($headerLine);
-        } while ('' != trim($headerLine));
+	public static function createResponseFromFile($fp)
+	{
+		$response = new HTTP_Request2_Response(fgets($fp));
+		do {
+			$headerLine = fgets($fp);
+			$response->parseHeaderLine($headerLine);
+		} while ('' != trim($headerLine));
 
-        while (!feof($fp)) {
-            $response->appendBody(fread($fp, 8192));
-        }
-        return $response;
-    }
+		while (!feof($fp)) {
+			$response->appendBody(fread($fp, 8192));
+		}
+		return $response;
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

libs/PEAR.1.9/HTTP/Request2/Adapter/Socket.php 2 patches

Indentation +759 added lines, -759 removed lines patch added patch discarded remove patch

@@ -1,45 +1,45 @@  discard block
 block discarded – undo
 <?php
 /**
- * Socket-based adapter for HTTP_Request2
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <[email protected]>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <[email protected]>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Socket.php 290921 2009-11-18 17:31:58Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
+	 * Socket-based adapter for HTTP_Request2
+	 *
+	 * PHP version 5
+	 *
+	 * LICENSE:
+	 *
+	 * Copyright (c) 2008, 2009, Alexey Borzov <[email protected]>
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions
+	 * are met:
+	 *
+	 *    * Redistributions of source code must retain the above copyright
+	 *      notice, this list of conditions and the following disclaimer.
+	 *    * Redistributions in binary form must reproduce the above copyright
+	 *      notice, this list of conditions and the following disclaimer in the
+	 *      documentation and/or other materials provided with the distribution.
+	 *    * The names of the authors may not be used to endorse or promote products
+	 *      derived from this software without specific prior written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+	 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+	 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+	 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+	 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+	 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+	 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+	 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @category   HTTP
+	 * @package    HTTP_Request2
+	 * @author     Alexey Borzov <[email protected]>
+	 * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+	 * @version    SVN: $Id: Socket.php 290921 2009-11-18 17:31:58Z avb $
+	 * @link       http://pear.php.net/package/HTTP_Request2
+	 */
 
 /**
  * Base class for HTTP_Request2 adapters
@@ -62,19 +62,19 @@  discard block
 block discarded – undo
    /**
     * Regular expression for 'token' rule from RFC 2616
     */
-    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
+	const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
 
    /**
     * Regular expression for 'quoted-string' rule from RFC 2616
     */
-    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
+	const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
 
    /**
     * Connected sockets, needed for Keep-Alive support
     * @var  array
     * @see  connect()
     */
-    protected static $sockets = array();
+	protected static $sockets = array();
 
    /**
     * Data for digest authentication scheme
@@ -88,39 +88,39 @@  discard block
 block discarded – undo
     *
     * @var  array
     */
-    protected static $challenges = array();
+	protected static $challenges = array();
 
    /**
     * Connected socket
     * @var  resource
     * @see  connect()
     */
-    protected $socket;
+	protected $socket;
 
    /**
     * Challenge used for server digest authentication
     * @var  array
     */
-    protected $serverChallenge;
+	protected $serverChallenge;
 
    /**
     * Challenge used for proxy digest authentication
     * @var  array
     */
-    protected $proxyChallenge;
+	protected $proxyChallenge;
 
    /**
     * Sum of start time and global timeout, exception will be thrown if request continues past this time
     * @var  integer
     */
-    protected $deadline = null;
+	protected $deadline = null;
 
    /**
     * Remaining length of the current chunk, when reading chunked response
     * @var  integer
     * @see  readChunked()
     */
-    protected $chunkLength = 0;
+	protected $chunkLength = 0;
 
    /**
     * Remaining amount of redirections to follow
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
     *
     * @var  integer
     */
-    protected $redirectCountdown = null;
+	protected $redirectCountdown = null;
 
    /**
     * Sends request to the remote server and returns its response
@@ -139,69 +139,69 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        $this->request = $request;
-
-        // Use global request timeout if given, see feature requests #5735, #8964
-        if ($timeout = $request->getConfig('timeout')) {
-            $this->deadline = time() + $timeout;
-        } else {
-            $this->deadline = null;
-        }
-
-        try {
-            $keepAlive = $this->connect();
-            $headers   = $this->prepareHeaders();
-            if (false === @fwrite($this->socket, $headers, strlen($headers))) {
-                throw new HTTP_Request2_Exception('Error writing request');
-            }
-            // provide request headers to the observer, see request #7633
-            $this->request->setLastEvent('sentHeaders', $headers);
-            $this->writeBody();
-
-            if ($this->deadline && time() > $this->deadline) {
-                throw new HTTP_Request2_Exception(
-                    'Request timed out after ' .
-                    $request->getConfig('timeout') . ' second(s)'
-                );
-            }
-
-            $response = $this->readResponse();
-
-            if (!$this->canKeepAlive($keepAlive, $response)) {
-                $this->disconnect();
-            }
-
-            if ($this->shouldUseProxyDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($this->shouldUseServerDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($authInfo = $response->getHeader('authentication-info')) {
-                $this->updateChallenge($this->serverChallenge, $authInfo);
-            }
-            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
-                $this->updateChallenge($this->proxyChallenge, $proxyInfo);
-            }
-
-        } catch (Exception $e) {
-            $this->disconnect();
-        }
-
-        unset($this->request, $this->requestBody);
-
-        if (!empty($e)) {
-            throw $e;
-        }
-
-        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
-            return $response;
-        } else {
-            return $this->handleRedirect($request, $response);
-        }
-    }
+	public function sendRequest(HTTP_Request2 $request)
+	{
+		$this->request = $request;
+
+		// Use global request timeout if given, see feature requests #5735, #8964
+		if ($timeout = $request->getConfig('timeout')) {
+			$this->deadline = time() + $timeout;
+		} else {
+			$this->deadline = null;
+		}
+
+		try {
+			$keepAlive = $this->connect();
+			$headers   = $this->prepareHeaders();
+			if (false === @fwrite($this->socket, $headers, strlen($headers))) {
+				throw new HTTP_Request2_Exception('Error writing request');
+			}
+			// provide request headers to the observer, see request #7633
+			$this->request->setLastEvent('sentHeaders', $headers);
+			$this->writeBody();
+
+			if ($this->deadline && time() > $this->deadline) {
+				throw new HTTP_Request2_Exception(
+					'Request timed out after ' .
+					$request->getConfig('timeout') . ' second(s)'
+				);
+			}
+
+			$response = $this->readResponse();
+
+			if (!$this->canKeepAlive($keepAlive, $response)) {
+				$this->disconnect();
+			}
+
+			if ($this->shouldUseProxyDigestAuth($response)) {
+				return $this->sendRequest($request);
+			}
+			if ($this->shouldUseServerDigestAuth($response)) {
+				return $this->sendRequest($request);
+			}
+			if ($authInfo = $response->getHeader('authentication-info')) {
+				$this->updateChallenge($this->serverChallenge, $authInfo);
+			}
+			if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
+				$this->updateChallenge($this->proxyChallenge, $proxyInfo);
+			}
+
+		} catch (Exception $e) {
+			$this->disconnect();
+		}
+
+		unset($this->request, $this->requestBody);
+
+		if (!empty($e)) {
+			throw $e;
+		}
+
+		if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
+			return $response;
+		} else {
+			return $this->handleRedirect($request, $response);
+		}
+	}
 
    /**
     * Connects to the remote server
@@ -209,114 +209,114 @@  discard block
 block discarded – undo
     * @return   bool    whether the connection can be persistent
     * @throws   HTTP_Request2_Exception
     */
-    protected function connect()
-    {
-        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
-        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $headers = $this->request->getHeaders();
-        $reqHost = $this->request->getUrl()->getHost();
-        if (!($reqPort = $this->request->getUrl()->getPort())) {
-            $reqPort = $secure? 443: 80;
-        }
-
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_Exception('Proxy port not provided');
-            }
-            $proxy = true;
-        } else {
-            $host  = $reqHost;
-            $port  = $reqPort;
-            $proxy = false;
-        }
-
-        if ($tunnel && !$proxy) {
-            throw new HTTP_Request2_Exception(
-                "Trying to perform CONNECT request without proxy"
-            );
-        }
-        if ($secure && !in_array('ssl', stream_get_transports())) {
-            throw new HTTP_Request2_Exception(
-                'Need OpenSSL support for https:// requests'
-            );
-        }
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
-        // connection token to a proxy server...
-        if ($proxy && !$secure &&
-            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
-        ) {
-            $this->request->setHeader('connection');
-        }
-
-        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
-                      empty($headers['connection'])) ||
-                     (!empty($headers['connection']) &&
-                      'Keep-Alive' == $headers['connection']);
-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
-
-        $options = array();
-        if ($secure || $tunnel) {
-            foreach ($this->request->getConfig() as $name => $value) {
-                if ('ssl_' == substr($name, 0, 4) && null !== $value) {
-                    if ('ssl_verify_host' == $name) {
-                        if ($value) {
-                            $options['CN_match'] = $reqHost;
-                        }
-                    } else {
-                        $options[substr($name, 4)] = $value;
-                    }
-                }
-            }
-            ksort($options);
-        }
-
-        // Changing SSL context options after connection is established does *not*
-        // work, we need a new connection if options change
-        $remote    = $host . ':' . $port;
-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
-                     (empty($options)? '': ':' . serialize($options));
-        unset($this->socket);
-
-        // We use persistent connections and have a connected socket?
-        // Ensure that the socket is still connected, see bug #16149
-        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
-            !feof(self::$sockets[$socketKey])
-        ) {
-            $this->socket =& self::$sockets[$socketKey];
-
-        } elseif ($secure && $proxy && !$tunnel) {
-            $this->establishTunnel();
-            $this->request->setLastEvent(
-                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
-            );
-            self::$sockets[$socketKey] =& $this->socket;
-
-        } else {
-            // Set SSL context options if doing HTTPS request or creating a tunnel
-            $context = stream_context_create();
-            foreach ($options as $name => $value) {
-                if (!stream_context_set_option($context, 'ssl', $name, $value)) {
-                    throw new HTTP_Request2_Exception(
-                        "Error setting SSL context option '{$name}'"
-                    );
-                }
-            }
-            $this->socket = @stream_socket_client(
-                $remote, $errno, $errstr,
-                $this->request->getConfig('connect_timeout'),
-                STREAM_CLIENT_CONNECT, $context
-            );
-            if (!$this->socket) {
-                throw new HTTP_Request2_Exception(
-                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
-                );
-            }
-            $this->request->setLastEvent('connect', $remote);
-            self::$sockets[$socketKey] =& $this->socket;
-        }
-        return $keepAlive;
-    }
+	protected function connect()
+	{
+		$secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
+		$tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+		$headers = $this->request->getHeaders();
+		$reqHost = $this->request->getUrl()->getHost();
+		if (!($reqPort = $this->request->getUrl()->getPort())) {
+			$reqPort = $secure? 443: 80;
+		}
+
+		if ($host = $this->request->getConfig('proxy_host')) {
+			if (!($port = $this->request->getConfig('proxy_port'))) {
+				throw new HTTP_Request2_Exception('Proxy port not provided');
+			}
+			$proxy = true;
+		} else {
+			$host  = $reqHost;
+			$port  = $reqPort;
+			$proxy = false;
+		}
+
+		if ($tunnel && !$proxy) {
+			throw new HTTP_Request2_Exception(
+				"Trying to perform CONNECT request without proxy"
+			);
+		}
+		if ($secure && !in_array('ssl', stream_get_transports())) {
+			throw new HTTP_Request2_Exception(
+				'Need OpenSSL support for https:// requests'
+			);
+		}
+
+		// RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
+		// connection token to a proxy server...
+		if ($proxy && !$secure &&
+			!empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
+		) {
+			$this->request->setHeader('connection');
+		}
+
+		$keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
+					  empty($headers['connection'])) ||
+					 (!empty($headers['connection']) &&
+					  'Keep-Alive' == $headers['connection']);
+		$host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
+
+		$options = array();
+		if ($secure || $tunnel) {
+			foreach ($this->request->getConfig() as $name => $value) {
+				if ('ssl_' == substr($name, 0, 4) && null !== $value) {
+					if ('ssl_verify_host' == $name) {
+						if ($value) {
+							$options['CN_match'] = $reqHost;
+						}
+					} else {
+						$options[substr($name, 4)] = $value;
+					}
+				}
+			}
+			ksort($options);
+		}
+
+		// Changing SSL context options after connection is established does *not*
+		// work, we need a new connection if options change
+		$remote    = $host . ':' . $port;
+		$socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
+					 (empty($options)? '': ':' . serialize($options));
+		unset($this->socket);
+
+		// We use persistent connections and have a connected socket?
+		// Ensure that the socket is still connected, see bug #16149
+		if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
+			!feof(self::$sockets[$socketKey])
+		) {
+			$this->socket =& self::$sockets[$socketKey];
+
+		} elseif ($secure && $proxy && !$tunnel) {
+			$this->establishTunnel();
+			$this->request->setLastEvent(
+				'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
+			);
+			self::$sockets[$socketKey] =& $this->socket;
+
+		} else {
+			// Set SSL context options if doing HTTPS request or creating a tunnel
+			$context = stream_context_create();
+			foreach ($options as $name => $value) {
+				if (!stream_context_set_option($context, 'ssl', $name, $value)) {
+					throw new HTTP_Request2_Exception(
+						"Error setting SSL context option '{$name}'"
+					);
+				}
+			}
+			$this->socket = @stream_socket_client(
+				$remote, $errno, $errstr,
+				$this->request->getConfig('connect_timeout'),
+				STREAM_CLIENT_CONNECT, $context
+			);
+			if (!$this->socket) {
+				throw new HTTP_Request2_Exception(
+					"Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
+				);
+			}
+			$this->request->setLastEvent('connect', $remote);
+			self::$sockets[$socketKey] =& $this->socket;
+		}
+		return $keepAlive;
+	}
 
    /**
     * Establishes a tunnel to a secure remote server via HTTP CONNECT request
@@ -328,40 +328,40 @@  discard block
 block discarded – undo
     * @link     http://tools.ietf.org/html/rfc2817#section-5.2
     * @throws   HTTP_Request2_Exception
     */
-    protected function establishTunnel()
-    {
-        $donor   = new self;
-        $connect = new HTTP_Request2(
-            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
-            array_merge($this->request->getConfig(),
-                        array('adapter' => $donor))
-        );
-        $response = $connect->send();
-        // Need any successful (2XX) response
-        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
-            throw new HTTP_Request2_Exception(
-                'Failed to connect via HTTPS proxy. Proxy response: ' .
-                $response->getStatus() . ' ' . $response->getReasonPhrase()
-            );
-        }
-        $this->socket = $donor->socket;
-
-        $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
-        );
-
-        foreach ($modes as $mode) {
-            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
-                return;
-            }
-        }
-        throw new HTTP_Request2_Exception(
-            'Failed to enable secure connection when connecting through proxy'
-        );
-    }
+	protected function establishTunnel()
+	{
+		$donor   = new self;
+		$connect = new HTTP_Request2(
+			$this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
+			array_merge($this->request->getConfig(),
+						array('adapter' => $donor))
+		);
+		$response = $connect->send();
+		// Need any successful (2XX) response
+		if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
+			throw new HTTP_Request2_Exception(
+				'Failed to connect via HTTPS proxy. Proxy response: ' .
+				$response->getStatus() . ' ' . $response->getReasonPhrase()
+			);
+		}
+		$this->socket = $donor->socket;
+
+		$modes = array(
+			STREAM_CRYPTO_METHOD_TLS_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
+			STREAM_CRYPTO_METHOD_SSLv2_CLIENT
+		);
+
+		foreach ($modes as $mode) {
+			if (stream_socket_enable_crypto($this->socket, true, $mode)) {
+				return;
+			}
+		}
+		throw new HTTP_Request2_Exception(
+			'Failed to enable secure connection when connecting through proxy'
+		);
+	}
 
    /**
     * Checks whether current connection may be reused or should be closed
@@ -371,34 +371,34 @@  discard block
 block discarded – undo
     * @param    HTTP_Request2_Response  response object to check
     * @return   boolean
     */
-    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
-    {
-        // Do not close socket on successful CONNECT request
-        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-            200 <= $response->getStatus() && 300 > $response->getStatus()
-        ) {
-            return true;
-        }
-
-        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
-                       null !== $response->getHeader('content-length');
-        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
-                       (null === $response->getHeader('connection') &&
-                        '1.1' == $response->getVersion());
-        return $requestKeepAlive && $lengthKnown && $persistent;
-    }
+	protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
+	{
+		// Do not close socket on successful CONNECT request
+		if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+			200 <= $response->getStatus() && 300 > $response->getStatus()
+		) {
+			return true;
+		}
+
+		$lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
+					   null !== $response->getHeader('content-length');
+		$persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
+					   (null === $response->getHeader('connection') &&
+						'1.1' == $response->getVersion());
+		return $requestKeepAlive && $lengthKnown && $persistent;
+	}
 
    /**
     * Disconnects from the remote server
     */
-    protected function disconnect()
-    {
-        if (is_resource($this->socket)) {
-            fclose($this->socket);
-            $this->socket = null;
-            $this->request->setLastEvent('disconnect');
-        }
-    }
+	protected function disconnect()
+	{
+		if (is_resource($this->socket)) {
+			fclose($this->socket);
+			$this->socket = null;
+			$this->request->setLastEvent('disconnect');
+		}
+	}
 
    /**
     * Handles HTTP redirection
@@ -412,49 +412,49 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2_Response      Response from a new location
     * @throws   HTTP_Request2_Exception
     */
-    protected function handleRedirect(HTTP_Request2 $request,
-                                      HTTP_Request2_Response $response)
-    {
-        if (is_null($this->redirectCountdown)) {
-            $this->redirectCountdown = $request->getConfig('max_redirects');
-        }
-        if (0 == $this->redirectCountdown) {
-            // Copying cURL behaviour
-            throw new HTTP_Request2_Exception(
-                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed'
-            );
-        }
-        $redirectUrl = new Net_URL2(
-            $response->getHeader('location'),
-            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
-        );
-        // refuse non-HTTP redirect
-        if ($redirectUrl->isAbsolute()
-            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-        ) {
-            throw new HTTP_Request2_Exception(
-                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString()
-            );
-        }
-        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
-        // but in practice it is often not
-        if (!$redirectUrl->isAbsolute()) {
-            $redirectUrl = $request->getUrl()->resolve($redirectUrl);
-        }
-        $redirect = clone $request;
-        $redirect->setUrl($redirectUrl);
-        if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
-             && in_array($response->getStatus(), array(301, 302)))
-        ) {
-            $redirect->setMethod(HTTP_Request2::METHOD_GET);
-            $redirect->setBody('');
-        }
-
-        if (0 < $this->redirectCountdown) {
-            $this->redirectCountdown--;
-        }
-        return $this->sendRequest($redirect);
-    }
+	protected function handleRedirect(HTTP_Request2 $request,
+									  HTTP_Request2_Response $response)
+	{
+		if (is_null($this->redirectCountdown)) {
+			$this->redirectCountdown = $request->getConfig('max_redirects');
+		}
+		if (0 == $this->redirectCountdown) {
+			// Copying cURL behaviour
+			throw new HTTP_Request2_Exception(
+				'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed'
+			);
+		}
+		$redirectUrl = new Net_URL2(
+			$response->getHeader('location'),
+			array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
+		);
+		// refuse non-HTTP redirect
+		if ($redirectUrl->isAbsolute()
+			&& !in_array($redirectUrl->getScheme(), array('http', 'https'))
+		) {
+			throw new HTTP_Request2_Exception(
+				'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString()
+			);
+		}
+		// Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
+		// but in practice it is often not
+		if (!$redirectUrl->isAbsolute()) {
+			$redirectUrl = $request->getUrl()->resolve($redirectUrl);
+		}
+		$redirect = clone $request;
+		$redirect->setUrl($redirectUrl);
+		if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
+			 && in_array($response->getStatus(), array(301, 302)))
+		) {
+			$redirect->setMethod(HTTP_Request2::METHOD_GET);
+			$redirect->setBody('');
+		}
+
+		if (0 < $this->redirectCountdown) {
+			$this->redirectCountdown--;
+		}
+		return $this->sendRequest($redirect);
+	}
 
    /**
     * Checks whether another request should be performed with server digest auth
@@ -473,52 +473,52 @@  discard block
 block discarded – undo
     * @return   boolean whether another request should be performed
     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
     */
-    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
-    {
-        // no sense repeating a request if we don't have credentials
-        if (401 != $response->getStatus() || !$this->request->getAuth()) {
-            return false;
-        }
-        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
-            return false;
-        }
-
-        $url    = $this->request->getUrl();
-        $scheme = $url->getScheme();
-        $host   = $scheme . '://' . $url->getHost();
-        if ($port = $url->getPort()) {
-            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
-                (0 == strcasecmp($scheme, 'https') && 443 != $port)
-            ) {
-                $host .= ':' . $port;
-            }
-        }
-
-        if (!empty($challenge['domain'])) {
-            $prefixes = array();
-            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
-                // don't bother with different servers
-                if ('/' == substr($prefix, 0, 1)) {
-                    $prefixes[] = $host . $prefix;
-                }
-            }
-        }
-        if (empty($prefixes)) {
-            $prefixes = array($host . '/');
-        }
-
-        $ret = true;
-        foreach ($prefixes as $prefix) {
-            if (!empty(self::$challenges[$prefix]) &&
-                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-            ) {
-                // probably credentials are invalid
-                $ret = false;
-            }
-            self::$challenges[$prefix] =& $challenge;
-        }
-        return $ret;
-    }
+	protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
+	{
+		// no sense repeating a request if we don't have credentials
+		if (401 != $response->getStatus() || !$this->request->getAuth()) {
+			return false;
+		}
+		if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
+			return false;
+		}
+
+		$url    = $this->request->getUrl();
+		$scheme = $url->getScheme();
+		$host   = $scheme . '://' . $url->getHost();
+		if ($port = $url->getPort()) {
+			if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
+				(0 == strcasecmp($scheme, 'https') && 443 != $port)
+			) {
+				$host .= ':' . $port;
+			}
+		}
+
+		if (!empty($challenge['domain'])) {
+			$prefixes = array();
+			foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
+				// don't bother with different servers
+				if ('/' == substr($prefix, 0, 1)) {
+					$prefixes[] = $host . $prefix;
+				}
+			}
+		}
+		if (empty($prefixes)) {
+			$prefixes = array($host . '/');
+		}
+
+		$ret = true;
+		foreach ($prefixes as $prefix) {
+			if (!empty(self::$challenges[$prefix]) &&
+				(empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+			) {
+				// probably credentials are invalid
+				$ret = false;
+			}
+			self::$challenges[$prefix] =& $challenge;
+		}
+		return $ret;
+	}
 
    /**
     * Checks whether another request should be performed with proxy digest auth
@@ -537,28 +537,28 @@  discard block
 block discarded – undo
     * @return   boolean whether another request should be performed
     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
     */
-    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
-    {
-        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
-            return false;
-        }
-        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
-            return false;
-        }
-
-        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
-               ':' . $this->request->getConfig('proxy_port');
-
-        if (!empty(self::$challenges[$key]) &&
-            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-        ) {
-            $ret = false;
-        } else {
-            $ret = true;
-        }
-        self::$challenges[$key] = $challenge;
-        return $ret;
-    }
+	protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
+	{
+		if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
+			return false;
+		}
+		if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
+			return false;
+		}
+
+		$key = 'proxy://' . $this->request->getConfig('proxy_host') .
+			   ':' . $this->request->getConfig('proxy_port');
+
+		if (!empty(self::$challenges[$key]) &&
+			(empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+		) {
+			$ret = false;
+		} else {
+			$ret = true;
+		}
+		self::$challenges[$key] = $challenge;
+		return $ret;
+	}
 
    /**
     * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
@@ -588,48 +588,48 @@  discard block
 block discarded – undo
     *                   no challenge is present in header value
     * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
     */
-    protected function parseDigestChallenge($headerValue)
-    {
-        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
-        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
-        if (!preg_match($challenge, $headerValue, $matches)) {
-            return false;
-        }
-
-        preg_match_all('!' . $authParam . '!', $matches[0], $params);
-        $paramsAry   = array();
-        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
-                             'algorithm', 'qop');
-        for ($i = 0; $i < count($params[0]); $i++) {
-            // section 3.2.1: Any unrecognized directive MUST be ignored.
-            if (in_array($params[1][$i], $knownParams)) {
-                if ('"' == substr($params[2][$i], 0, 1)) {
-                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-                } else {
-                    $paramsAry[$params[1][$i]] = $params[2][$i];
-                }
-            }
-        }
-        // we only support qop=auth
-        if (!empty($paramsAry['qop']) &&
-            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
-        ) {
-            throw new HTTP_Request2_Exception(
-                "Only 'auth' qop is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['qop']}'"
-            );
-        }
-        // we only support algorithm=MD5
-        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
-            throw new HTTP_Request2_Exception(
-                "Only 'MD5' algorithm is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['algorithm']}'"
-            );
-        }
-
-        return $paramsAry;
-    }
+	protected function parseDigestChallenge($headerValue)
+	{
+		$authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+					   self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
+		$challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
+		if (!preg_match($challenge, $headerValue, $matches)) {
+			return false;
+		}
+
+		preg_match_all('!' . $authParam . '!', $matches[0], $params);
+		$paramsAry   = array();
+		$knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
+							 'algorithm', 'qop');
+		for ($i = 0; $i < count($params[0]); $i++) {
+			// section 3.2.1: Any unrecognized directive MUST be ignored.
+			if (in_array($params[1][$i], $knownParams)) {
+				if ('"' == substr($params[2][$i], 0, 1)) {
+					$paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+				} else {
+					$paramsAry[$params[1][$i]] = $params[2][$i];
+				}
+			}
+		}
+		// we only support qop=auth
+		if (!empty($paramsAry['qop']) &&
+			!in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
+		) {
+			throw new HTTP_Request2_Exception(
+				"Only 'auth' qop is currently supported in digest authentication, " .
+				"server requested '{$paramsAry['qop']}'"
+			);
+		}
+		// we only support algorithm=MD5
+		if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
+			throw new HTTP_Request2_Exception(
+				"Only 'MD5' algorithm is currently supported in digest authentication, " .
+				"server requested '{$paramsAry['algorithm']}'"
+			);
+		}
+
+		return $paramsAry;
+	}
 
    /**
     * Parses [Proxy-]Authentication-Info header value and updates challenge
@@ -638,26 +638,26 @@  discard block
 block discarded – undo
     * @param    string  value of [Proxy-]Authentication-Info header
     * @todo     validate server rspauth response
     */
-    protected function updateChallenge(&$challenge, $headerValue)
-    {
-        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
-        $paramsAry   = array();
-
-        preg_match_all($authParam, $headerValue, $params);
-        for ($i = 0; $i < count($params[0]); $i++) {
-            if ('"' == substr($params[2][$i], 0, 1)) {
-                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-            } else {
-                $paramsAry[$params[1][$i]] = $params[2][$i];
-            }
-        }
-        // for now, just update the nonce value
-        if (!empty($paramsAry['nextnonce'])) {
-            $challenge['nonce'] = $paramsAry['nextnonce'];
-            $challenge['nc']    = 1;
-        }
-    }
+	protected function updateChallenge(&$challenge, $headerValue)
+	{
+		$authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+					   self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
+		$paramsAry   = array();
+
+		preg_match_all($authParam, $headerValue, $params);
+		for ($i = 0; $i < count($params[0]); $i++) {
+			if ('"' == substr($params[2][$i], 0, 1)) {
+				$paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+			} else {
+				$paramsAry[$params[1][$i]] = $params[2][$i];
+			}
+		}
+		// for now, just update the nonce value
+		if (!empty($paramsAry['nextnonce'])) {
+			$challenge['nonce'] = $paramsAry['nextnonce'];
+			$challenge['nc']    = 1;
+		}
+	}
 
    /**
     * Creates a value for [Proxy-]Authorization header when using digest authentication
@@ -669,40 +669,40 @@  discard block
 block discarded – undo
     * @return   string  value of [Proxy-]Authorization request header
     * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
     */
-    protected function createDigestResponse($user, $password, $url, &$challenge)
-    {
-        if (false !== ($q = strpos($url, '?')) &&
-            $this->request->getConfig('digest_compat_ie')
-        ) {
-            $url = substr($url, 0, $q);
-        }
-
-        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
-        $a2 = md5($this->request->getMethod() . ':' . $url);
-
-        if (empty($challenge['qop'])) {
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
-        } else {
-            $challenge['cnonce'] = 'Req2.' . rand();
-            if (empty($challenge['nc'])) {
-                $challenge['nc'] = 1;
-            }
-            $nc     = sprintf('%08x', $challenge['nc']++);
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
-                          $challenge['cnonce'] . ':auth:' . $a2);
-        }
-        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
-               'realm="' . $challenge['realm'] . '", ' .
-               'nonce="' . $challenge['nonce'] . '", ' .
-               'uri="' . $url . '", ' .
-               'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])?
-                ', opaque="' . $challenge['opaque'] . '"':
-                '') .
-               (!empty($challenge['qop'])?
-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
-                '');
-    }
+	protected function createDigestResponse($user, $password, $url, &$challenge)
+	{
+		if (false !== ($q = strpos($url, '?')) &&
+			$this->request->getConfig('digest_compat_ie')
+		) {
+			$url = substr($url, 0, $q);
+		}
+
+		$a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
+		$a2 = md5($this->request->getMethod() . ':' . $url);
+
+		if (empty($challenge['qop'])) {
+			$digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
+		} else {
+			$challenge['cnonce'] = 'Req2.' . rand();
+			if (empty($challenge['nc'])) {
+				$challenge['nc'] = 1;
+			}
+			$nc     = sprintf('%08x', $challenge['nc']++);
+			$digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
+						  $challenge['cnonce'] . ':auth:' . $a2);
+		}
+		return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
+			   'realm="' . $challenge['realm'] . '", ' .
+			   'nonce="' . $challenge['nonce'] . '", ' .
+			   'uri="' . $url . '", ' .
+			   'response="' . $digest . '"' .
+			   (!empty($challenge['opaque'])?
+				', opaque="' . $challenge['opaque'] . '"':
+				'') .
+			   (!empty($challenge['qop'])?
+				', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
+				'');
+	}
 
    /**
     * Adds 'Authorization' header (if needed) to request headers array
@@ -712,41 +712,41 @@  discard block
 block discarded – undo
     * @param    string  request URL (needed for digest authentication)
     * @throws   HTTP_Request2_Exception
     */
-    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
-    {
-        if (!($auth = $this->request->getAuth())) {
-            return;
-        }
-        switch ($auth['scheme']) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['authorization'] =
-                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->serverChallenge);
-                $fullUrl = ('/' == $requestUrl[0])?
-                           $this->request->getUrl()->getScheme() . '://' .
-                            $requestHost . $requestUrl:
-                           $requestUrl;
-                foreach (array_keys(self::$challenges) as $key) {
-                    if ($key == substr($fullUrl, 0, strlen($key))) {
-                        $headers['authorization'] = $this->createDigestResponse(
-                            $auth['user'], $auth['password'],
-                            $requestUrl, self::$challenges[$key]
-                        );
-                        $this->serverChallenge =& self::$challenges[$key];
-                        break;
-                    }
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_Exception(
-                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"
-                );
-        }
-    }
+	protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
+	{
+		if (!($auth = $this->request->getAuth())) {
+			return;
+		}
+		switch ($auth['scheme']) {
+			case HTTP_Request2::AUTH_BASIC:
+				$headers['authorization'] =
+					'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
+				break;
+
+			case HTTP_Request2::AUTH_DIGEST:
+				unset($this->serverChallenge);
+				$fullUrl = ('/' == $requestUrl[0])?
+						   $this->request->getUrl()->getScheme() . '://' .
+							$requestHost . $requestUrl:
+						   $requestUrl;
+				foreach (array_keys(self::$challenges) as $key) {
+					if ($key == substr($fullUrl, 0, strlen($key))) {
+						$headers['authorization'] = $this->createDigestResponse(
+							$auth['user'], $auth['password'],
+							$requestUrl, self::$challenges[$key]
+						);
+						$this->serverChallenge =& self::$challenges[$key];
+						break;
+					}
+				}
+				break;
+
+			default:
+				throw new HTTP_Request2_Exception(
+					"Unknown HTTP authentication scheme '{$auth['scheme']}'"
+				);
+		}
+	}
 
    /**
     * Adds 'Proxy-Authorization' header (if needed) to request headers array
@@ -755,43 +755,43 @@  discard block
 block discarded – undo
     * @param    string  request URL (needed for digest authentication)
     * @throws   HTTP_Request2_Exception
     */
-    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
-    {
-        if (!$this->request->getConfig('proxy_host') ||
-            !($user = $this->request->getConfig('proxy_user')) ||
-            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
-             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
-        ) {
-            return;
-        }
-
-        $password = $this->request->getConfig('proxy_password');
-        switch ($this->request->getConfig('proxy_auth_scheme')) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['proxy-authorization'] =
-                    'Basic ' . base64_encode($user . ':' . $password);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->proxyChallenge);
-                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
-                            ':' . $this->request->getConfig('proxy_port');
-                if (!empty(self::$challenges[$proxyUrl])) {
-                    $headers['proxy-authorization'] = $this->createDigestResponse(
-                        $user, $password,
-                        $requestUrl, self::$challenges[$proxyUrl]
-                    );
-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_Exception(
-                    "Unknown HTTP authentication scheme '" .
-                    $this->request->getConfig('proxy_auth_scheme') . "'"
-                );
-        }
-    }
+	protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
+	{
+		if (!$this->request->getConfig('proxy_host') ||
+			!($user = $this->request->getConfig('proxy_user')) ||
+			(0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
+			 HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
+		) {
+			return;
+		}
+
+		$password = $this->request->getConfig('proxy_password');
+		switch ($this->request->getConfig('proxy_auth_scheme')) {
+			case HTTP_Request2::AUTH_BASIC:
+				$headers['proxy-authorization'] =
+					'Basic ' . base64_encode($user . ':' . $password);
+				break;
+
+			case HTTP_Request2::AUTH_DIGEST:
+				unset($this->proxyChallenge);
+				$proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
+							':' . $this->request->getConfig('proxy_port');
+				if (!empty(self::$challenges[$proxyUrl])) {
+					$headers['proxy-authorization'] = $this->createDigestResponse(
+						$user, $password,
+						$requestUrl, self::$challenges[$proxyUrl]
+					);
+					$this->proxyChallenge =& self::$challenges[$proxyUrl];
+				}
+				break;
+
+			default:
+				throw new HTTP_Request2_Exception(
+					"Unknown HTTP authentication scheme '" .
+					$this->request->getConfig('proxy_auth_scheme') . "'"
+				);
+		}
+	}
 
 
    /**
@@ -800,88 +800,88 @@  discard block
 block discarded – undo
     * @return   string
     * @throws   HTTP_Request2_Exception
     */
-    protected function prepareHeaders()
-    {
-        $headers = $this->request->getHeaders();
-        $url     = $this->request->getUrl();
-        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $host    = $url->getHost();
-
-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
-        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
-            $host .= ':' . (empty($port)? $defaultPort: $port);
-        }
-        // Do not overwrite explicitly set 'Host' header, see bug #16146
-        if (!isset($headers['host'])) {
-            $headers['host'] = $host;
-        }
-
-        if ($connect) {
-            $requestUrl = $host;
-
-        } else {
-            if (!$this->request->getConfig('proxy_host') ||
-                0 == strcasecmp($url->getScheme(), 'https')
-            ) {
-                $requestUrl = '';
-            } else {
-                $requestUrl = $url->getScheme() . '://' . $host;
-            }
-            $path        = $url->getPath();
-            $query       = $url->getQuery();
-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
-        }
-
-        if ('1.1' == $this->request->getConfig('protocol_version') &&
-            extension_loaded('zlib') && !isset($headers['accept-encoding'])
-        ) {
-            $headers['accept-encoding'] = 'gzip, deflate';
-        }
-
-        $this->addAuthorizationHeader($headers, $host, $requestUrl);
-        $this->addProxyAuthorizationHeader($headers, $requestUrl);
-        $this->calculateRequestLength($headers);
-
-        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
-                      $this->request->getConfig('protocol_version') . "\r\n";
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
-        }
-        return $headersStr . "\r\n";
-    }
+	protected function prepareHeaders()
+	{
+		$headers = $this->request->getHeaders();
+		$url     = $this->request->getUrl();
+		$connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+		$host    = $url->getHost();
+
+		$defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
+		if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
+			$host .= ':' . (empty($port)? $defaultPort: $port);
+		}
+		// Do not overwrite explicitly set 'Host' header, see bug #16146
+		if (!isset($headers['host'])) {
+			$headers['host'] = $host;
+		}
+
+		if ($connect) {
+			$requestUrl = $host;
+
+		} else {
+			if (!$this->request->getConfig('proxy_host') ||
+				0 == strcasecmp($url->getScheme(), 'https')
+			) {
+				$requestUrl = '';
+			} else {
+				$requestUrl = $url->getScheme() . '://' . $host;
+			}
+			$path        = $url->getPath();
+			$query       = $url->getQuery();
+			$requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
+		}
+
+		if ('1.1' == $this->request->getConfig('protocol_version') &&
+			extension_loaded('zlib') && !isset($headers['accept-encoding'])
+		) {
+			$headers['accept-encoding'] = 'gzip, deflate';
+		}
+
+		$this->addAuthorizationHeader($headers, $host, $requestUrl);
+		$this->addProxyAuthorizationHeader($headers, $requestUrl);
+		$this->calculateRequestLength($headers);
+
+		$headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
+					  $this->request->getConfig('protocol_version') . "\r\n";
+		foreach ($headers as $name => $value) {
+			$canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+			$headersStr   .= $canonicalName . ': ' . $value . "\r\n";
+		}
+		return $headersStr . "\r\n";
+	}
 
    /**
     * Sends the request body
     *
     * @throws   HTTP_Request2_Exception
     */
-    protected function writeBody()
-    {
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            return;
-        }
-
-        $position   = 0;
-        $bufferSize = $this->request->getConfig('buffer_size');
-        while ($position < $this->contentLength) {
-            if (is_string($this->requestBody)) {
-                $str = substr($this->requestBody, $position, $bufferSize);
-            } elseif (is_resource($this->requestBody)) {
-                $str = fread($this->requestBody, $bufferSize);
-            } else {
-                $str = $this->requestBody->read($bufferSize);
-            }
-            if (false === @fwrite($this->socket, $str, strlen($str))) {
-                throw new HTTP_Request2_Exception('Error writing request');
-            }
-            // Provide the length of written string to the observer, request #7630
-            $this->request->setLastEvent('sentBodyPart', strlen($str));
-            $position += strlen($str);
-        }
-    }
+	protected function writeBody()
+	{
+		if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+			0 == $this->contentLength
+		) {
+			return;
+		}
+
+		$position   = 0;
+		$bufferSize = $this->request->getConfig('buffer_size');
+		while ($position < $this->contentLength) {
+			if (is_string($this->requestBody)) {
+				$str = substr($this->requestBody, $position, $bufferSize);
+			} elseif (is_resource($this->requestBody)) {
+				$str = fread($this->requestBody, $bufferSize);
+			} else {
+				$str = $this->requestBody->read($bufferSize);
+			}
+			if (false === @fwrite($this->socket, $str, strlen($str))) {
+				throw new HTTP_Request2_Exception('Error writing request');
+			}
+			// Provide the length of written string to the observer, request #7630
+			$this->request->setLastEvent('sentBodyPart', strlen($str));
+			$position += strlen($str);
+		}
+	}
 
    /**
     * Reads the remote server's response
@@ -889,70 +889,70 @@  discard block
 block discarded – undo
     * @return   HTTP_Request2_Response
     * @throws   HTTP_Request2_Exception
     */
-    protected function readResponse()
-    {
-        $bufferSize = $this->request->getConfig('buffer_size');
-
-        do {
-            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
-            do {
-                $headerLine = $this->readLine($bufferSize);
-                $response->parseHeaderLine($headerLine);
-            } while ('' != $headerLine);
-        } while (in_array($response->getStatus(), array(100, 101)));
-
-        $this->request->setLastEvent('receivedHeaders', $response);
-
-        // No body possible in such responses
-        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
-            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-             200 <= $response->getStatus() && 300 > $response->getStatus()) ||
-            in_array($response->getStatus(), array(204, 304))
-        ) {
-            return $response;
-        }
-
-        $chunked = 'chunked' == $response->getHeader('transfer-encoding');
-        $length  = $response->getHeader('content-length');
-        $hasBody = false;
-        if ($chunked || null === $length || 0 < intval($length)) {
-            // RFC 2616, section 4.4:
-            // 3. ... If a message is received with both a
-            // Transfer-Encoding header field and a Content-Length header field,
-            // the latter MUST be ignored.
-            $toRead = ($chunked || null === $length)? null: $length;
-            $this->chunkLength = 0;
-
-            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
-                if ($chunked) {
-                    $data = $this->readChunked($bufferSize);
-                } elseif (is_null($toRead)) {
-                    $data = $this->fread($bufferSize);
-                } else {
-                    $data    = $this->fread(min($toRead, $bufferSize));
-                    $toRead -= strlen($data);
-                }
-                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
-                    break;
-                }
-
-                $hasBody = true;
-                if ($this->request->getConfig('store_body')) {
-                    $response->appendBody($data);
-                }
-                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
-                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);
-                } else {
-                    $this->request->setLastEvent('receivedBodyPart', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            $this->request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
+	protected function readResponse()
+	{
+		$bufferSize = $this->request->getConfig('buffer_size');
+
+		do {
+			$response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
+			do {
+				$headerLine = $this->readLine($bufferSize);
+				$response->parseHeaderLine($headerLine);
+			} while ('' != $headerLine);
+		} while (in_array($response->getStatus(), array(100, 101)));
+
+		$this->request->setLastEvent('receivedHeaders', $response);
+
+		// No body possible in such responses
+		if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
+			(HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+			 200 <= $response->getStatus() && 300 > $response->getStatus()) ||
+			in_array($response->getStatus(), array(204, 304))
+		) {
+			return $response;
+		}
+
+		$chunked = 'chunked' == $response->getHeader('transfer-encoding');
+		$length  = $response->getHeader('content-length');
+		$hasBody = false;
+		if ($chunked || null === $length || 0 < intval($length)) {
+			// RFC 2616, section 4.4:
+			// 3. ... If a message is received with both a
+			// Transfer-Encoding header field and a Content-Length header field,
+			// the latter MUST be ignored.
+			$toRead = ($chunked || null === $length)? null: $length;
+			$this->chunkLength = 0;
+
+			while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
+				if ($chunked) {
+					$data = $this->readChunked($bufferSize);
+				} elseif (is_null($toRead)) {
+					$data = $this->fread($bufferSize);
+				} else {
+					$data    = $this->fread(min($toRead, $bufferSize));
+					$toRead -= strlen($data);
+				}
+				if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
+					break;
+				}
+
+				$hasBody = true;
+				if ($this->request->getConfig('store_body')) {
+					$response->appendBody($data);
+				}
+				if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
+					$this->request->setLastEvent('receivedEncodedBodyPart', $data);
+				} else {
+					$this->request->setLastEvent('receivedBodyPart', $data);
+				}
+			}
+		}
+
+		if ($hasBody) {
+			$this->request->setLastEvent('receivedBody', $response);
+		}
+		return $response;
+	}
 
    /**
     * Reads until either the end of the socket or a newline, whichever comes first
@@ -964,27 +964,27 @@  discard block
 block discarded – undo
     * @return   Available data up to the newline (not including newline)
     * @throws   HTTP_Request2_Exception     In case of timeout
     */
-    protected function readLine($bufferSize)
-    {
-        $line = '';
-        while (!feof($this->socket)) {
-            if ($this->deadline) {
-                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-            }
-            $line .= @fgets($this->socket, $bufferSize);
-            $info  = stream_get_meta_data($this->socket);
-            if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-                $reason = $this->deadline
-                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                          : 'due to default_socket_timeout php.ini setting';
-                throw new HTTP_Request2_Exception("Request timed out {$reason}");
-            }
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
+	protected function readLine($bufferSize)
+	{
+		$line = '';
+		while (!feof($this->socket)) {
+			if ($this->deadline) {
+				stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+			}
+			$line .= @fgets($this->socket, $bufferSize);
+			$info  = stream_get_meta_data($this->socket);
+			if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+				$reason = $this->deadline
+						  ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+						  : 'due to default_socket_timeout php.ini setting';
+				throw new HTTP_Request2_Exception("Request timed out {$reason}");
+			}
+			if (substr($line, -1) == "\n") {
+				return rtrim($line, "\r\n");
+			}
+		}
+		return $line;
+	}
 
    /**
     * Wrapper around fread(), handles global request timeout
@@ -993,21 +993,21 @@  discard block
 block discarded – undo
     * @return   Data read from socket
     * @throws   HTTP_Request2_Exception     In case of timeout
     */
-    protected function fread($length)
-    {
-        if ($this->deadline) {
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-        }
-        $data = fread($this->socket, $length);
-        $info = stream_get_meta_data($this->socket);
-        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-            $reason = $this->deadline
-                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                      : 'due to default_socket_timeout php.ini setting';
-            throw new HTTP_Request2_Exception("Request timed out {$reason}");
-        }
-        return $data;
-    }
+	protected function fread($length)
+	{
+		if ($this->deadline) {
+			stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+		}
+		$data = fread($this->socket, $length);
+		$info = stream_get_meta_data($this->socket);
+		if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+			$reason = $this->deadline
+					  ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+					  : 'due to default_socket_timeout php.ini setting';
+			throw new HTTP_Request2_Exception("Request timed out {$reason}");
+		}
+		return $data;
+	}
 
    /**
     * Reads a part of response body encoded with chunked Transfer-Encoding
@@ -1016,31 +1016,31 @@  discard block
 block discarded – undo
     * @return   string
     * @throws   HTTP_Request2_Exception
     */
-    protected function readChunked($bufferSize)
-    {
-        // at start of the next chunk?
-        if (0 == $this->chunkLength) {
-            $line = $this->readLine($bufferSize);
-            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                throw new HTTP_Request2_Exception(
-                    "Cannot decode chunked response, invalid chunk length '{$line}'"
-                );
-            } else {
-                $this->chunkLength = hexdec($matches[1]);
-                // Chunk with zero length indicates the end
-                if (0 == $this->chunkLength) {
-                    $this->readLine($bufferSize);
-                    return '';
-                }
-            }
-        }
-        $data = $this->fread(min($this->chunkLength, $bufferSize));
-        $this->chunkLength -= strlen($data);
-        if (0 == $this->chunkLength) {
-            $this->readLine($bufferSize); // Trailing CRLF
-        }
-        return $data;
-    }
+	protected function readChunked($bufferSize)
+	{
+		// at start of the next chunk?
+		if (0 == $this->chunkLength) {
+			$line = $this->readLine($bufferSize);
+			if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+				throw new HTTP_Request2_Exception(
+					"Cannot decode chunked response, invalid chunk length '{$line}'"
+				);
+			} else {
+				$this->chunkLength = hexdec($matches[1]);
+				// Chunk with zero length indicates the end
+				if (0 == $this->chunkLength) {
+					$this->readLine($bufferSize);
+					return '';
+				}
+			}
+		}
+		$data = $this->fread(min($this->chunkLength, $bufferSize));
+		$this->chunkLength -= strlen($data);
+		if (0 == $this->chunkLength) {
+			$this->readLine($bufferSize); // Trailing CRLF
+		}
+		return $data;
+	}
 }
 
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +20 added lines, -23 removed lines patch added patch discarded remove patch

@@ -216,7 +216,7 @@  discard block
 block discarded – undo
         $headers = $this->request->getHeaders();
         $reqHost = $this->request->getUrl()->getHost();
         if (!($reqPort = $this->request->getUrl()->getPort())) {
-            $reqPort = $secure? 443: 80;
+            $reqPort = $secure ? 443 : 80;
         }
 
         if ($host = $this->request->getConfig('proxy_host')) {
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
                       empty($headers['connection'])) ||
                      (!empty($headers['connection']) &&
                       'Keep-Alive' == $headers['connection']);
-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
+        $host = ((!$secure || $proxy) ? 'tcp://' : 'ssl://') . $host;
 
         $options = array();
         if ($secure || $tunnel) {
@@ -274,8 +274,8 @@  discard block
 block discarded – undo
         // Changing SSL context options after connection is established does *not*
         // work, we need a new connection if options change
         $remote    = $host . ':' . $port;
-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
-                     (empty($options)? '': ':' . serialize($options));
+        $socketKey = $remote . (($secure && $proxy) ? "->{$reqHost}:{$reqPort}" : '') .
+                     (empty($options) ? '' : ':' . serialize($options));
         unset($this->socket);
 
         // We use persistent connections and have a connected socket?
@@ -283,14 +283,14 @@  discard block
 block discarded – undo
         if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
             !feof(self::$sockets[$socketKey])
         ) {
-            $this->socket =& self::$sockets[$socketKey];
+            $this->socket = & self::$sockets[$socketKey];
 
         } elseif ($secure && $proxy && !$tunnel) {
             $this->establishTunnel();
             $this->request->setLastEvent(
                 'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
             );
-            self::$sockets[$socketKey] =& $this->socket;
+            self::$sockets[$socketKey] = & $this->socket;
 
         } else {
             // Set SSL context options if doing HTTPS request or creating a tunnel
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
                 );
             }
             $this->request->setLastEvent('connect', $remote);
-            self::$sockets[$socketKey] =& $this->socket;
+            self::$sockets[$socketKey] = & $this->socket;
         }
         return $keepAlive;
     }
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
                 // probably credentials are invalid
                 $ret = false;
             }
-            self::$challenges[$prefix] =& $challenge;
+            self::$challenges[$prefix] = & $challenge;
         }
         return $ret;
     }
@@ -696,12 +696,10 @@  discard block
 block discarded – undo
                'nonce="' . $challenge['nonce'] . '", ' .
                'uri="' . $url . '", ' .
                'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])?
-                ', opaque="' . $challenge['opaque'] . '"':
-                '') .
-               (!empty($challenge['qop'])?
-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
-                '');
+               (!empty($challenge['opaque']) ?
+                ', opaque="' . $challenge['opaque'] . '"' : '') .
+               (!empty($challenge['qop']) ?
+                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"' : '');
     }
 
    /**
@@ -725,17 +723,16 @@  discard block
 block discarded – undo
 
             case HTTP_Request2::AUTH_DIGEST:
                 unset($this->serverChallenge);
-                $fullUrl = ('/' == $requestUrl[0])?
+                $fullUrl = ('/' == $requestUrl[0]) ?
                            $this->request->getUrl()->getScheme() . '://' .
-                            $requestHost . $requestUrl:
-                           $requestUrl;
+                            $requestHost . $requestUrl : $requestUrl;
                 foreach (array_keys(self::$challenges) as $key) {
                     if ($key == substr($fullUrl, 0, strlen($key))) {
                         $headers['authorization'] = $this->createDigestResponse(
                             $auth['user'], $auth['password'],
                             $requestUrl, self::$challenges[$key]
                         );
-                        $this->serverChallenge =& self::$challenges[$key];
+                        $this->serverChallenge = & self::$challenges[$key];
                         break;
                     }
                 }
@@ -781,7 +778,7 @@  discard block
 block discarded – undo
                         $user, $password,
                         $requestUrl, self::$challenges[$proxyUrl]
                     );
-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
+                    $this->proxyChallenge = & self::$challenges[$proxyUrl];
                 }
                 break;
 
@@ -807,9 +804,9 @@  discard block
 block discarded – undo
         $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
         $host    = $url->getHost();
 
-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
+        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https') ? 443 : 80;
         if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
-            $host .= ':' . (empty($port)? $defaultPort: $port);
+            $host .= ':' . (empty($port) ? $defaultPort : $port);
         }
         // Do not overwrite explicitly set 'Host' header, see bug #16146
         if (!isset($headers['host'])) {
@@ -829,7 +826,7 @@  discard block
 block discarded – undo
             }
             $path        = $url->getPath();
             $query       = $url->getQuery();
-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
+            $requestUrl .= (empty($path) ? '/' : $path) . (empty($query) ? '' : '?' . $query);
         }
 
         if ('1.1' == $this->request->getConfig('protocol_version') &&
@@ -920,7 +917,7 @@  discard block
 block discarded – undo
             // 3. ... If a message is received with both a
             // Transfer-Encoding header field and a Content-Length header field,
             // the latter MUST be ignored.
-            $toRead = ($chunked || null === $length)? null: $length;
+            $toRead = ($chunked || null === $length) ? null : $length;
             $this->chunkLength = 0;
 
             while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {

Please login to merge, or discard this patch.

		@@ -170,7 +170,7 @@
		block discarded – undo
170	170	// reset socket timeout if we don't have request timeout specified,
171	171	// prevents further calls failing with a bogus Exception
172	172	if (!$this->deadline) {
173		- $default = (int)@ini_get('default_socket_timeout');
	173	+ $default = (int) @ini_get('default_socket_timeout');
174	174	stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
175	175	}
176	176	if ($info['timed_out']) {

		@@ -348,15 +348,22 @@
		block discarded – undo
348	348	$args = array();
349	349	if (!empty($v['args'])) {
350	350	foreach ($v['args'] as $arg) {
351		- if (is_null($arg)) $args[] = 'null';
352		- elseif (is_array($arg)) $args[] = 'Array';
353		- elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
354		- elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
355		- elseif (is_int($arg) \|\| is_double($arg)) $args[] = $arg;
356		- else {
	351	+ if (is_null($arg)) {
	352	+ $args[] = 'null';
	353	+ } elseif (is_array($arg)) {
	354	+ $args[] = 'Array';
	355	+ } elseif (is_object($arg)) {
	356	+ $args[] = 'Object('.get_class($arg).')';
	357	+ } elseif (is_bool($arg)) {
	358	+ $args[] = $arg ? 'true' : 'false';
	359	+ } elseif (is_int($arg) \|\| is_double($arg)) {
	360	+ $args[] = $arg;
	361	+ } else {
357	362	$arg = (string)$arg;
358	363	$str = htmlspecialchars(substr($arg, 0, 16), ENT_COMPAT \| ENT_HTML401, 'UTF-8', false);
359		- if (strlen($arg) > 16) $str .= '…';
	364	+ if (strlen($arg) > 16) {
	365	+ $str .= '…';
	366	+ }
360	367	$args[] = "'" . $str . "'";
361	368	}
362	369	}

GitHub Access Token became invalid

Pull Request — develop (#1782)

Status

Category

Switch Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +591 added lines, -591 removed lines patch added patch discarded remove patch

Indentation +108 added lines, -108 removed lines patch added patch discarded remove patch

Switch Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +238 added lines, -238 removed lines patch added patch discarded remove patch

Indentation +963 added lines, -963 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -10 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines patch added patch discarded remove patch

Braces +14 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +291 added lines, -291 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +81 added lines, -81 removed lines patch added patch discarded remove patch

Indentation +97 added lines, -97 removed lines patch added patch discarded remove patch

Indentation +759 added lines, -759 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -23 removed lines patch added patch discarded remove patch

		@@ -435,11 +435,11 @@
		block discarded – undo
435	435
436	436	try {
437	437	switch (strtolower($this->getHeader('content-encoding'))) {
438		- case 'gzip':
439		- $decoded = self::decodeGzip($this->body);
440		- break;
441		- case 'deflate':
442		- $decoded = self::decodeDeflate($this->body);
	438	+ case 'gzip':
	439	+ $decoded = self::decodeGzip($this->body);
	440	+ break;
	441	+ case 'deflate':
	442	+ $decoded = self::decodeDeflate($this->body);
443	443	}
444	444	} catch (Exception $e) {
445	445	}

		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	// the request
143	143	300 => 'Multiple Choices',
144	144	301 => 'Moved Permanently',
145		- 302 => 'Found', // 1.1
	145	+ 302 => 'Found', // 1.1
146	146	303 => 'See Other',
147	147	304 => 'Not Modified',
148	148	305 => 'Use Proxy',
		@@ -220,8 +220,8 @@ discard block
		block discarded – undo
220	220	$this->version = $m[1];
221	221	$this->code = intval($m[2]);
222	222	$this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
223		- $this->bodyEncoded = (bool)$bodyEncoded;
224		- $this->effectiveUrl = (string)$effectiveUrl;
	223	+ $this->bodyEncoded = (bool) $bodyEncoded;
	224	+ $this->effectiveUrl = (string) $effectiveUrl;
225	225	}
226	226
227	227	/**
		@@ -241,9 +241,8 @@ discard block
		block discarded – undo
241	241	if ('' == $headerLine) {
242	242	// empty string signals the end of headers, process the received ones
243	243	if (!empty($this->headers['set-cookie'])) {
244		- $cookies = is_array($this->headers['set-cookie'])?
245		- $this->headers['set-cookie']:
246		- array($this->headers['set-cookie']);
	244	+ $cookies = is_array($this->headers['set-cookie']) ?
	245	+ $this->headers['set-cookie'] : array($this->headers['set-cookie']);
247	246	foreach ($cookies as $cookieString) {
248	247	$this->parseCookie($cookieString);
249	248	}
		@@ -400,7 +399,7 @@ discard block
		block discarded – undo
400	399	return $this->headers;
401	400	} else {
402	401	$headerName = strtolower($headerName);
403		- return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
	402	+ return isset($this->headers[$headerName]) ? $this->headers[$headerName] : null;
404	403	}
405	404	}
406	405
		@@ -625,7 +624,7 @@ discard block
		block discarded – undo
625	624	// We should check for presence of zlib header and use gzuncompress() or
626	625	// gzinflate() as needed. See bug #15305
627	626	$header = unpack('n', substr($data, 0, 2));
628		- return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
	627	+ return (0 == $header[1] % 31) ? gzuncompress($data) : gzinflate($data);
629	628	}
630	629	}
631	630	?>
632	631	\ No newline at end of file

		@@ -1,22 +1,22 @@ discard block
		block discarded – undo
1	1	<?php
2	2	/**
3		- * SOCKS5 proxy connection class
4		- *
5		- * PHP version 5
6		- *
7		- * LICENSE
8		- *
9		- * This source file is subject to BSD 3-Clause License that is bundled
10		- * with this package in the file LICENSE and available at the URL
11		- * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
12		- *
13		- * @category HTTP
14		- * @package HTTP_Request2
15		- * @author Alexey Borzov <[email protected]>
16		- * @copyright 2008-2014 Alexey Borzov <[email protected]>
17		- * @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
18		- * @link http://pear.php.net/package/HTTP_Request2
19		- */
	3	+ * SOCKS5 proxy connection class
	4	+ *
	5	+ * PHP version 5
	6	+ *
	7	+ * LICENSE
	8	+ *
	9	+ * This source file is subject to BSD 3-Clause License that is bundled
	10	+ * with this package in the file LICENSE and available at the URL
	11	+ * https://raw.github.com/pear/HTTP_Request2/trunk/docs/LICENSE
	12	+ *
	13	+ * @category HTTP
	14	+ * @package HTTP_Request2
	15	+ * @author Alexey Borzov <[email protected]>
	16	+ * @copyright 2008-2014 Alexey Borzov <[email protected]>
	17	+ * @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause License
	18	+ * @link http://pear.php.net/package/HTTP_Request2
	19	+ */
20	20
21	21	/** Socket wrapper class used by Socket Adapter */
22	22	require_once 'HTTP/Request2/SocketWrapper.php';
		@@ -35,101 +35,101 @@ discard block
		block discarded – undo
35	35	*/
36	36	class HTTP_Request2_SOCKS5 extends HTTP_Request2_SocketWrapper
37	37	{
38		- /**
39		- * Constructor, tries to connect and authenticate to a SOCKS5 proxy
40		- *
41		- * @param string $address Proxy address, e.g. 'tcp://localhost:1080'
42		- * @param int $timeout Connection timeout (seconds)
43		- * @param array $contextOptions Stream context options
44		- * @param string $username Proxy user name
45		- * @param string $password Proxy password
46		- *
47		- * @throws HTTP_Request2_LogicException
48		- * @throws HTTP_Request2_ConnectionException
49		- * @throws HTTP_Request2_MessageException
50		- */
51		- public function __construct(
52		- $address, $timeout = 10, array $contextOptions = array(),
53		- $username = null, $password = null
54		- ) {
55		- parent::__construct($address, $timeout, $contextOptions);
	38	+ /**
	39	+ * Constructor, tries to connect and authenticate to a SOCKS5 proxy
	40	+ *
	41	+ * @param string $address Proxy address, e.g. 'tcp://localhost:1080'
	42	+ * @param int $timeout Connection timeout (seconds)
	43	+ * @param array $contextOptions Stream context options
	44	+ * @param string $username Proxy user name
	45	+ * @param string $password Proxy password
	46	+ *
	47	+ * @throws HTTP_Request2_LogicException
	48	+ * @throws HTTP_Request2_ConnectionException
	49	+ * @throws HTTP_Request2_MessageException
	50	+ */
	51	+ public function __construct(
	52	+ $address, $timeout = 10, array $contextOptions = array(),
	53	+ $username = null, $password = null
	54	+ ) {
	55	+ parent::__construct($address, $timeout, $contextOptions);
56	56
57		- if (strlen($username)) {
58		- $request = pack('C4', 5, 2, 0, 2);
59		- } else {
60		- $request = pack('C3', 5, 1, 0);
61		- }
62		- $this->write($request);
63		- $response = unpack('Cversion/Cmethod', $this->read(3));
64		- if (5 != $response['version']) {
65		- throw new HTTP_Request2_MessageException(
66		- 'Invalid version received from SOCKS5 proxy: ' . $response['version'],
67		- HTTP_Request2_Exception::MALFORMED_RESPONSE
68		- );
69		- }
70		- switch ($response['method']) {
71		- case 2:
72		- $this->performAuthentication($username, $password);
73		- case 0:
74		- break;
75		- default:
76		- throw new HTTP_Request2_ConnectionException(
77		- "Connection rejected by proxy due to unsupported auth method"
78		- );
79		- }
80		- }
	57	+ if (strlen($username)) {
	58	+ $request = pack('C4', 5, 2, 0, 2);
	59	+ } else {
	60	+ $request = pack('C3', 5, 1, 0);
	61	+ }
	62	+ $this->write($request);
	63	+ $response = unpack('Cversion/Cmethod', $this->read(3));
	64	+ if (5 != $response['version']) {
	65	+ throw new HTTP_Request2_MessageException(
	66	+ 'Invalid version received from SOCKS5 proxy: ' . $response['version'],
	67	+ HTTP_Request2_Exception::MALFORMED_RESPONSE
	68	+ );
	69	+ }
	70	+ switch ($response['method']) {
	71	+ case 2:
	72	+ $this->performAuthentication($username, $password);
	73	+ case 0:
	74	+ break;
	75	+ default:
	76	+ throw new HTTP_Request2_ConnectionException(
	77	+ "Connection rejected by proxy due to unsupported auth method"
	78	+ );
	79	+ }
	80	+ }
81	81
82		- /**
83		- * Performs username/password authentication for SOCKS5
84		- *
85		- * @param string $username Proxy user name
86		- * @param string $password Proxy password
87		- *
88		- * @throws HTTP_Request2_ConnectionException
89		- * @throws HTTP_Request2_MessageException
90		- * @link http://tools.ietf.org/html/rfc1929
91		- */
92		- protected function performAuthentication($username, $password)
93		- {
94		- $request = pack('C2', 1, strlen($username)) . $username
95		- . pack('C', strlen($password)) . $password;
	82	+ /**
	83	+ * Performs username/password authentication for SOCKS5
	84	+ *
	85	+ * @param string $username Proxy user name
	86	+ * @param string $password Proxy password
	87	+ *
	88	+ * @throws HTTP_Request2_ConnectionException
	89	+ * @throws HTTP_Request2_MessageException
	90	+ * @link http://tools.ietf.org/html/rfc1929
	91	+ */
	92	+ protected function performAuthentication($username, $password)
	93	+ {
	94	+ $request = pack('C2', 1, strlen($username)) . $username
	95	+ . pack('C', strlen($password)) . $password;
96	96
97		- $this->write($request);
98		- $response = unpack('Cvn/Cstatus', $this->read(3));
99		- if (1 != $response['vn'] \|\| 0 != $response['status']) {
100		- throw new HTTP_Request2_ConnectionException(
101		- 'Connection rejected by proxy due to invalid username and/or password'
102		- );
103		- }
104		- }
	97	+ $this->write($request);
	98	+ $response = unpack('Cvn/Cstatus', $this->read(3));
	99	+ if (1 != $response['vn'] \|\| 0 != $response['status']) {
	100	+ throw new HTTP_Request2_ConnectionException(
	101	+ 'Connection rejected by proxy due to invalid username and/or password'
	102	+ );
	103	+ }
	104	+ }
105	105
106		- /**
107		- * Connects to a remote host via proxy
108		- *
109		- * @param string $remoteHost Remote host
110		- * @param int $remotePort Remote port
111		- *
112		- * @throws HTTP_Request2_ConnectionException
113		- * @throws HTTP_Request2_MessageException
114		- */
115		- public function connect($remoteHost, $remotePort)
116		- {
117		- $request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))
118		- . $remoteHost . pack('n', $remotePort);
	106	+ /**
	107	+ * Connects to a remote host via proxy
	108	+ *
	109	+ * @param string $remoteHost Remote host
	110	+ * @param int $remotePort Remote port
	111	+ *
	112	+ * @throws HTTP_Request2_ConnectionException
	113	+ * @throws HTTP_Request2_MessageException
	114	+ */
	115	+ public function connect($remoteHost, $remotePort)
	116	+ {
	117	+ $request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))
	118	+ . $remoteHost . pack('n', $remotePort);
119	119
120		- $this->write($request);
121		- $response = unpack('Cversion/Creply/Creserved', $this->read(1024));
122		- if (5 != $response['version'] \|\| 0 != $response['reserved']) {
123		- throw new HTTP_Request2_MessageException(
124		- 'Invalid response received from SOCKS5 proxy',
125		- HTTP_Request2_Exception::MALFORMED_RESPONSE
126		- );
127		- } elseif (0 != $response['reply']) {
128		- throw new HTTP_Request2_ConnectionException(
129		- "Unable to connect to {$remoteHost}:{$remotePort} through SOCKS5 proxy",
130		- 0, $response['reply']
131		- );
132		- }
133		- }
	120	+ $this->write($request);
	121	+ $response = unpack('Cversion/Creply/Creserved', $this->read(1024));
	122	+ if (5 != $response['version'] \|\| 0 != $response['reserved']) {
	123	+ throw new HTTP_Request2_MessageException(
	124	+ 'Invalid response received from SOCKS5 proxy',
	125	+ HTTP_Request2_Exception::MALFORMED_RESPONSE
	126	+ );
	127	+ } elseif (0 != $response['reply']) {
	128	+ throw new HTTP_Request2_ConnectionException(
	129	+ "Unable to connect to {$remoteHost}:{$remotePort} through SOCKS5 proxy",
	130	+ 0, $response['reply']
	131	+ );
	132	+ }
	133	+ }
134	134	}
135	135	?>
136	136	\ No newline at end of file

		@@ -68,14 +68,14 @@
		block discarded – undo
68	68	);
69	69	}
70	70	switch ($response['method']) {
71		- case 2:
72		- $this->performAuthentication($username, $password);
73		- case 0:
74		- break;
75		- default:
76		- throw new HTTP_Request2_ConnectionException(
77		- "Connection rejected by proxy due to unsupported auth method"
78		- );
	71	+ case 2:
	72	+ $this->performAuthentication($username, $password);
	73	+ case 0:
	74	+ break;
	75	+ default:
	76	+ throw new HTTP_Request2_ConnectionException(
	77	+ "Connection rejected by proxy due to unsupported auth method"
	78	+ );
79	79	}
80	80	}
81	81

		@@ -91,7 +91,7 @@
		block discarded – undo
91	91	*/
92	92	protected function performAuthentication($username, $password)
93	93	{
94		- $request = pack('C2', 1, strlen($username)) . $username
	94	+ $request = pack('C2', 1, strlen($username)) . $username
95	95	. pack('C', strlen($password)) . $password;
96	96
97	97	$this->write($request);

		@@ -38,260 +38,260 @@
		block discarded – undo
38	38	*/
39	39	class HTTP_Request2_SocketWrapper
40	40	{
41		- /**
42		- * PHP warning messages raised during stream_socket_client() call
43		- * @var array
44		- */
45		- protected $connectionWarnings = array();
	41	+ /**
	42	+ * PHP warning messages raised during stream_socket_client() call
	43	+ * @var array
	44	+ */
	45	+ protected $connectionWarnings = array();
46	46
47		- /**
48		- * Connected socket
49		- * @var resource
50		- */
51		- protected $socket;
	47	+ /**
	48	+ * Connected socket
	49	+ * @var resource
	50	+ */
	51	+ protected $socket;
52	52
53		- /**
54		- * Sum of start time and global timeout, exception will be thrown if request continues past this time
55		- * @var integer
56		- */
57		- protected $deadline;
	53	+ /**
	54	+ * Sum of start time and global timeout, exception will be thrown if request continues past this time
	55	+ * @var integer
	56	+ */
	57	+ protected $deadline;
58	58
59		- /**
60		- * Global timeout value, mostly for exception messages
61		- * @var integer
62		- */
63		- protected $timeout;
	59	+ /**
	60	+ * Global timeout value, mostly for exception messages
	61	+ * @var integer
	62	+ */
	63	+ protected $timeout;
64	64
65		- /**
66		- * Class constructor, tries to establish connection
67		- *
68		- * @param string $address Address for stream_socket_client() call,
69		- * e.g. 'tcp://localhost:80'
70		- * @param int $timeout Connection timeout (seconds)
71		- * @param array $contextOptions Context options
72		- *
73		- * @throws HTTP_Request2_LogicException
74		- * @throws HTTP_Request2_ConnectionException
75		- */
76		- public function __construct($address, $timeout, array $contextOptions = array())
77		- {
78		- if (!empty($contextOptions)
79		- && !isset($contextOptions['socket']) && !isset($contextOptions['ssl'])
80		- ) {
81		- // Backwards compatibility with 2.1.0 and 2.1.1 releases
82		- $contextOptions = array('ssl' => $contextOptions);
83		- }
84		- $context = stream_context_create();
85		- foreach ($contextOptions as $wrapper => $options) {
86		- foreach ($options as $name => $value) {
87		- if (!stream_context_set_option($context, $wrapper, $name, $value)) {
88		- throw new HTTP_Request2_LogicException(
89		- "Error setting '{$wrapper}' wrapper context option '{$name}'"
90		- );
91		- }
92		- }
93		- }
94		- set_error_handler(array($this, 'connectionWarningsHandler'));
95		- $this->socket = stream_socket_client(
96		- $address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context
97		- );
98		- restore_error_handler();
99		- // if we fail to bind to a specified local address (see request #19515),
100		- // connection still succeeds, albeit with a warning. Throw an Exception
101		- // with the warning text in this case as that connection is unlikely
102		- // to be what user wants and as Curl throws an error in similar case.
103		- if ($this->connectionWarnings) {
104		- if ($this->socket) {
105		- fclose($this->socket);
106		- }
107		- $error = $errstr ? $errstr : implode("\n", $this->connectionWarnings);
108		- throw new HTTP_Request2_ConnectionException(
109		- "Unable to connect to {$address}. Error: {$error}", 0, $errno
110		- );
111		- }
112		- }
	65	+ /**
	66	+ * Class constructor, tries to establish connection
	67	+ *
	68	+ * @param string $address Address for stream_socket_client() call,
	69	+ * e.g. 'tcp://localhost:80'
	70	+ * @param int $timeout Connection timeout (seconds)
	71	+ * @param array $contextOptions Context options
	72	+ *
	73	+ * @throws HTTP_Request2_LogicException
	74	+ * @throws HTTP_Request2_ConnectionException
	75	+ */
	76	+ public function __construct($address, $timeout, array $contextOptions = array())
	77	+ {
	78	+ if (!empty($contextOptions)
	79	+ && !isset($contextOptions['socket']) && !isset($contextOptions['ssl'])
	80	+ ) {
	81	+ // Backwards compatibility with 2.1.0 and 2.1.1 releases
	82	+ $contextOptions = array('ssl' => $contextOptions);
	83	+ }
	84	+ $context = stream_context_create();
	85	+ foreach ($contextOptions as $wrapper => $options) {
	86	+ foreach ($options as $name => $value) {
	87	+ if (!stream_context_set_option($context, $wrapper, $name, $value)) {
	88	+ throw new HTTP_Request2_LogicException(
	89	+ "Error setting '{$wrapper}' wrapper context option '{$name}'"
	90	+ );
	91	+ }
	92	+ }
	93	+ }
	94	+ set_error_handler(array($this, 'connectionWarningsHandler'));
	95	+ $this->socket = stream_socket_client(
	96	+ $address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context
	97	+ );
	98	+ restore_error_handler();
	99	+ // if we fail to bind to a specified local address (see request #19515),
	100	+ // connection still succeeds, albeit with a warning. Throw an Exception
	101	+ // with the warning text in this case as that connection is unlikely
	102	+ // to be what user wants and as Curl throws an error in similar case.
	103	+ if ($this->connectionWarnings) {
	104	+ if ($this->socket) {
	105	+ fclose($this->socket);
	106	+ }
	107	+ $error = $errstr ? $errstr : implode("\n", $this->connectionWarnings);
	108	+ throw new HTTP_Request2_ConnectionException(
	109	+ "Unable to connect to {$address}. Error: {$error}", 0, $errno
	110	+ );
	111	+ }
	112	+ }
113	113
114		- /**
115		- * Destructor, disconnects socket
116		- */
117		- public function __destruct()
118		- {
119		- fclose($this->socket);
120		- }
	114	+ /**
	115	+ * Destructor, disconnects socket
	116	+ */
	117	+ public function __destruct()
	118	+ {
	119	+ fclose($this->socket);
	120	+ }
121	121
122		- /**
123		- * Wrapper around fread(), handles global request timeout
124		- *
125		- * @param int $length Reads up to this number of bytes
126		- *
127		- * @return string Data read from socket
128		- * @throws HTTP_Request2_MessageException In case of timeout
129		- */
130		- public function read($length)
131		- {
132		- if ($this->deadline) {
133		- stream_set_timeout($this->socket, max($this->deadline - time(), 1));
134		- }
135		- $data = fread($this->socket, $length);
136		- $this->checkTimeout();
137		- return $data;
138		- }
	122	+ /**
	123	+ * Wrapper around fread(), handles global request timeout
	124	+ *
	125	+ * @param int $length Reads up to this number of bytes
	126	+ *
	127	+ * @return string Data read from socket
	128	+ * @throws HTTP_Request2_MessageException In case of timeout
	129	+ */
	130	+ public function read($length)
	131	+ {
	132	+ if ($this->deadline) {
	133	+ stream_set_timeout($this->socket, max($this->deadline - time(), 1));
	134	+ }
	135	+ $data = fread($this->socket, $length);
	136	+ $this->checkTimeout();
	137	+ return $data;
	138	+ }
139	139
140		- /**
141		- * Reads until either the end of the socket or a newline, whichever comes first
142		- *
143		- * Strips the trailing newline from the returned data, handles global
144		- * request timeout. Method idea borrowed from Net_Socket PEAR package.
145		- *
146		- * @param int $bufferSize buffer size to use for reading
147		- * @param int $localTimeout timeout value to use just for this call
148		- * (used when waiting for "100 Continue" response)
149		- *
150		- * @return string Available data up to the newline (not including newline)
151		- * @throws HTTP_Request2_MessageException In case of timeout
152		- */
153		- public function readLine($bufferSize, $localTimeout = null)
154		- {
155		- $line = '';
156		- while (!feof($this->socket)) {
157		- if (null !== $localTimeout) {
158		- stream_set_timeout($this->socket, $localTimeout);
159		- } elseif ($this->deadline) {
160		- stream_set_timeout($this->socket, max($this->deadline - time(), 1));
161		- }
	140	+ /**
	141	+ * Reads until either the end of the socket or a newline, whichever comes first
	142	+ *
	143	+ * Strips the trailing newline from the returned data, handles global
	144	+ * request timeout. Method idea borrowed from Net_Socket PEAR package.
	145	+ *
	146	+ * @param int $bufferSize buffer size to use for reading
	147	+ * @param int $localTimeout timeout value to use just for this call
	148	+ * (used when waiting for "100 Continue" response)
	149	+ *
	150	+ * @return string Available data up to the newline (not including newline)
	151	+ * @throws HTTP_Request2_MessageException In case of timeout
	152	+ */
	153	+ public function readLine($bufferSize, $localTimeout = null)
	154	+ {
	155	+ $line = '';
	156	+ while (!feof($this->socket)) {
	157	+ if (null !== $localTimeout) {
	158	+ stream_set_timeout($this->socket, $localTimeout);
	159	+ } elseif ($this->deadline) {
	160	+ stream_set_timeout($this->socket, max($this->deadline - time(), 1));
	161	+ }
162	162
163		- $line .= @fgets($this->socket, $bufferSize);
	163	+ $line .= @fgets($this->socket, $bufferSize);
164	164
165		- if (null === $localTimeout) {
166		- $this->checkTimeout();
	165	+ if (null === $localTimeout) {
	166	+ $this->checkTimeout();
167	167
168		- } else {
169		- $info = stream_get_meta_data($this->socket);
170		- // reset socket timeout if we don't have request timeout specified,
171		- // prevents further calls failing with a bogus Exception
172		- if (!$this->deadline) {
173		- $default = (int)@ini_get('default_socket_timeout');
174		- stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
175		- }
176		- if ($info['timed_out']) {
177		- throw new HTTP_Request2_MessageException(
178		- "readLine() call timed out", HTTP_Request2_Exception::TIMEOUT
179		- );
180		- }
181		- }
182		- if (substr($line, -1) == "\n") {
183		- return rtrim($line, "\r\n");
184		- }
185		- }
186		- return $line;
187		- }
	168	+ } else {
	169	+ $info = stream_get_meta_data($this->socket);
	170	+ // reset socket timeout if we don't have request timeout specified,
	171	+ // prevents further calls failing with a bogus Exception
	172	+ if (!$this->deadline) {
	173	+ $default = (int)@ini_get('default_socket_timeout');
	174	+ stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
	175	+ }
	176	+ if ($info['timed_out']) {
	177	+ throw new HTTP_Request2_MessageException(
	178	+ "readLine() call timed out", HTTP_Request2_Exception::TIMEOUT
	179	+ );
	180	+ }
	181	+ }
	182	+ if (substr($line, -1) == "\n") {
	183	+ return rtrim($line, "\r\n");
	184	+ }
	185	+ }
	186	+ return $line;
	187	+ }
188	188
189		- /**
190		- * Wrapper around fwrite(), handles global request timeout
191		- *
192		- * @param string $data String to be written
193		- *
194		- * @return int
195		- * @throws HTTP_Request2_MessageException
196		- */
197		- public function write($data)
198		- {
199		- if ($this->deadline) {
200		- stream_set_timeout($this->socket, max($this->deadline - time(), 1));
201		- }
202		- $written = fwrite($this->socket, $data);
203		- $this->checkTimeout();
204		- // http://www.php.net/manual/en/function.fwrite.php#96951
205		- if ($written < strlen($data)) {
206		- throw new HTTP_Request2_MessageException('Error writing request');
207		- }
208		- return $written;
209		- }
	189	+ /**
	190	+ * Wrapper around fwrite(), handles global request timeout
	191	+ *
	192	+ * @param string $data String to be written
	193	+ *
	194	+ * @return int
	195	+ * @throws HTTP_Request2_MessageException
	196	+ */
	197	+ public function write($data)
	198	+ {
	199	+ if ($this->deadline) {
	200	+ stream_set_timeout($this->socket, max($this->deadline - time(), 1));
	201	+ }
	202	+ $written = fwrite($this->socket, $data);
	203	+ $this->checkTimeout();
	204	+ // http://www.php.net/manual/en/function.fwrite.php#96951
	205	+ if ($written < strlen($data)) {
	206	+ throw new HTTP_Request2_MessageException('Error writing request');
	207	+ }
	208	+ return $written;
	209	+ }
210	210
211		- /**
212		- * Tests for end-of-file on a socket
213		- *
214		- * @return bool
215		- */
216		- public function eof()
217		- {
218		- return feof($this->socket);
219		- }
	211	+ /**
	212	+ * Tests for end-of-file on a socket
	213	+ *
	214	+ * @return bool
	215	+ */
	216	+ public function eof()
	217	+ {
	218	+ return feof($this->socket);
	219	+ }
220	220
221		- /**
222		- * Sets request deadline
223		- *
224		- * @param int $deadline Exception will be thrown if request continues
225		- * past this time
226		- * @param int $timeout Original request timeout value, to use in
227		- * Exception message
228		- */
229		- public function setDeadline($deadline, $timeout)
230		- {
231		- $this->deadline = $deadline;
232		- $this->timeout = $timeout;
233		- }
	221	+ /**
	222	+ * Sets request deadline
	223	+ *
	224	+ * @param int $deadline Exception will be thrown if request continues
	225	+ * past this time
	226	+ * @param int $timeout Original request timeout value, to use in
	227	+ * Exception message
	228	+ */
	229	+ public function setDeadline($deadline, $timeout)
	230	+ {
	231	+ $this->deadline = $deadline;
	232	+ $this->timeout = $timeout;
	233	+ }
234	234
235		- /**
236		- * Turns on encryption on a socket
237		- *
238		- * @throws HTTP_Request2_ConnectionException
239		- */
240		- public function enableCrypto()
241		- {
242		- $modes = array(
243		- STREAM_CRYPTO_METHOD_TLS_CLIENT,
244		- STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
245		- STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
246		- STREAM_CRYPTO_METHOD_SSLv2_CLIENT
247		- );
	235	+ /**
	236	+ * Turns on encryption on a socket
	237	+ *
	238	+ * @throws HTTP_Request2_ConnectionException
	239	+ */
	240	+ public function enableCrypto()
	241	+ {
	242	+ $modes = array(
	243	+ STREAM_CRYPTO_METHOD_TLS_CLIENT,
	244	+ STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
	245	+ STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
	246	+ STREAM_CRYPTO_METHOD_SSLv2_CLIENT
	247	+ );
248	248
249		- foreach ($modes as $mode) {
250		- if (stream_socket_enable_crypto($this->socket, true, $mode)) {
251		- return;
252		- }
253		- }
254		- throw new HTTP_Request2_ConnectionException(
255		- 'Failed to enable secure connection when connecting through proxy'
256		- );
257		- }
	249	+ foreach ($modes as $mode) {
	250	+ if (stream_socket_enable_crypto($this->socket, true, $mode)) {
	251	+ return;
	252	+ }
	253	+ }
	254	+ throw new HTTP_Request2_ConnectionException(
	255	+ 'Failed to enable secure connection when connecting through proxy'
	256	+ );
	257	+ }
258	258
259		- /**
260		- * Throws an Exception if stream timed out
261		- *
262		- * @throws HTTP_Request2_MessageException
263		- */
264		- protected function checkTimeout()
265		- {
266		- $info = stream_get_meta_data($this->socket);
267		- if ($info['timed_out'] \|\| $this->deadline && time() > $this->deadline) {
268		- $reason = $this->deadline
269		- ? "after {$this->timeout} second(s)"
270		- : 'due to default_socket_timeout php.ini setting';
271		- throw new HTTP_Request2_MessageException(
272		- "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
273		- );
274		- }
275		- }
	259	+ /**
	260	+ * Throws an Exception if stream timed out
	261	+ *
	262	+ * @throws HTTP_Request2_MessageException
	263	+ */
	264	+ protected function checkTimeout()
	265	+ {
	266	+ $info = stream_get_meta_data($this->socket);
	267	+ if ($info['timed_out'] \|\| $this->deadline && time() > $this->deadline) {
	268	+ $reason = $this->deadline
	269	+ ? "after {$this->timeout} second(s)"
	270	+ : 'due to default_socket_timeout php.ini setting';
	271	+ throw new HTTP_Request2_MessageException(
	272	+ "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
	273	+ );
	274	+ }
	275	+ }
276	276
277		- /**
278		- * Error handler to use during stream_socket_client() call
279		- *
280		- * One stream_socket_client() call may produce multiple PHP warnings
281		- * (especially OpenSSL-related), we keep them in an array to later use for
282		- * the message of HTTP_Request2_ConnectionException
283		- *
284		- * @param int $errno error level
285		- * @param string $errstr error message
286		- *
287		- * @return bool
288		- */
289		- protected function connectionWarningsHandler($errno, $errstr)
290		- {
291		- if ($errno & E_WARNING) {
292		- array_unshift($this->connectionWarnings, $errstr);
293		- }
294		- return true;
295		- }
	277	+ /**
	278	+ * Error handler to use during stream_socket_client() call
	279	+ *
	280	+ * One stream_socket_client() call may produce multiple PHP warnings
	281	+ * (especially OpenSSL-related), we keep them in an array to later use for
	282	+ * the message of HTTP_Request2_ConnectionException
	283	+ *
	284	+ * @param int $errno error level
	285	+ * @param string $errstr error message
	286	+ *
	287	+ * @return bool
	288	+ */
	289	+ protected function connectionWarningsHandler($errno, $errstr)
	290	+ {
	291	+ if ($errno & E_WARNING) {
	292	+ array_unshift($this->connectionWarnings, $errstr);
	293	+ }
	294	+ return true;
	295	+ }
296	296	}
297	297	?>

		@@ -22,11 +22,11 @@ discard block
		block discarded – undo
22	22	/**#@+
23	23	* ERROR constants
24	24	*/
25		-define('PEAR_ERROR_RETURN', 1);
26		-define('PEAR_ERROR_PRINT', 2);
27		-define('PEAR_ERROR_TRIGGER', 4);
28		-define('PEAR_ERROR_DIE', 8);
29		-define('PEAR_ERROR_CALLBACK', 16);
	25	+define('PEAR_ERROR_RETURN', 1);
	26	+define('PEAR_ERROR_PRINT', 2);
	27	+define('PEAR_ERROR_TRIGGER', 4);
	28	+define('PEAR_ERROR_DIE', 8);
	29	+define('PEAR_ERROR_CALLBACK', 16);
30	30	/**
31	31	* WARNING: obsolete
32	32	* @deprecated
		@@ -38,12 +38,12 @@ discard block
		block discarded – undo
38	38
39	39	if (substr(PHP_OS, 0, 3) == 'WIN') {
40	40	define('OS_WINDOWS', true);
41		- define('OS_UNIX', false);
42		- define('PEAR_OS', 'Windows');
	41	+ define('OS_UNIX', false);
	42	+ define('PEAR_OS', 'Windows');
43	43	} else {
44	44	define('OS_WINDOWS', false);
45		- define('OS_UNIX', true);
46		- define('PEAR_OS', 'Unix'); // blatant assumption
	45	+ define('OS_UNIX', true);
	46	+ define('PEAR_OS', 'Unix'); // blatant assumption
47	47	}
48	48
49	49	$GLOBALS['_PEAR_default_error_mode'] = PEAR_ERROR_RETURN;
		@@ -415,7 +415,7 @@ discard block
		block discarded – undo
415	415	// $error_code is a non-empty array here; we walk through it trying
416	416	// to unset all values
417	417	foreach ($error_code as $key => $error) {
418		- $deleted = $this->_checkDelExpect($error) ? true : false;
	418	+ $deleted = $this->_checkDelExpect($error) ? true : false;
419	419	}
420	420
421	421	return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
		@@ -722,7 +722,7 @@ discard block
		block discarded – undo
722	722	$suffix = '.so';
723	723	}
724	724
725		- return @dl('php_'.$ext.$suffix) \|\| @dl($ext.$suffix);
	725	+ return @dl('php_' . $ext . $suffix) \|\| @dl($ext . $suffix);
726	726	}
727	727	}
728	728
		@@ -1021,13 +1021,12 @@ discard block
		block discarded – undo
1021	1021	if ($this->mode & PEAR_ERROR_CALLBACK) {
1022	1022	if (is_array($this->callback)) {
1023	1023	$callback = (is_object($this->callback[0]) ?
1024		- strtolower(get_class($this->callback[0])) :
1025		- $this->callback[0]) . '::' .
	1024	+ strtolower(get_class($this->callback[0])) : $this->callback[0]) . '::' .
1026	1025	$this->callback[1];
1027	1026	} else {
1028	1027	$callback = $this->callback;
1029	1028	}
1030		- return sprintf('[%s: message="%s" code=%d mode=callback '.
	1029	+ return sprintf('[%s: message="%s" code=%d mode=callback ' .
1031	1030	'callback=%s prefix="%s" info="%s"]',
1032	1031	strtolower(get_class($this)), $this->message, $this->code,
1033	1032	$callback, $this->error_message_prefix,
		@@ -1045,7 +1044,7 @@ discard block
		block discarded – undo
1045	1044	if ($this->mode & PEAR_ERROR_RETURN) {
1046	1045	$modes[] = 'return';
1047	1046	}
1048		- return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
	1047	+ return sprintf('[%s: message="%s" code=%d mode=%s level=%s ' .
1049	1048	'prefix="%s" info="%s"]',
1050	1049	strtolower(get_class($this)), $this->message, $this->code,
1051	1050	implode("\|", $modes), $levels[$this->level],

		@@ -277,11 +277,9 @@ discard block
		block discarded – undo
277	277	'class' => $cause['package'],
278	278	'message' => $cause['message'],
279	279	'file' => isset($cause['context']['file']) ?
280		- $cause['context']['file'] :
281		- 'unknown',
	280	+ $cause['context']['file'] : 'unknown',
282	281	'line' => isset($cause['context']['line']) ?
283		- $cause['context']['line'] :
284		- 'unknown',
	282	+ $cause['context']['line'] : 'unknown',
285	283	);
286	284	}
287	285	}
		@@ -294,7 +292,7 @@ discard block
		block discarded – undo
294	292	$this->_trace = $this->getTrace();
295	293	if (empty($this->_trace)) {
296	294	$backtrace = debug_backtrace();
297		- $this->_trace = array($backtrace[count($backtrace)-1]);
	295	+ $this->_trace = array($backtrace[count($backtrace) - 1]);
298	296	}
299	297	}
300	298	return $this->_trace;
		@@ -325,7 +323,7 @@ discard block
		block discarded – undo
325	323	$trace = $this->getTraceSafe();
326	324	$causes = array();
327	325	$this->getCauseMessage($causes);
328		- $html = '<table style="border: 1px" cellspacing="0">' . "\n";
	326	+ $html = '<table style="border: 1px" cellspacing="0">' . "\n";
329	327	foreach ($causes as $i => $cause) {
330	328	$html .= '<tr><td colspan="3" style="background: #ff9999">'
331	329	. str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
		@@ -350,24 +348,24 @@ discard block
		block discarded – undo
350	348	foreach ($v['args'] as $arg) {
351	349	if (is_null($arg)) $args[] = 'null';
352	350	elseif (is_array($arg)) $args[] = 'Array';
353		- elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
	351	+ elseif (is_object($arg)) $args[] = 'Object(' . get_class($arg) . ')';
354	352	elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
355	353	elseif (is_int($arg) \|\| is_double($arg)) $args[] = $arg;
356	354	else {
357		- $arg = (string)$arg;
	355	+ $arg = (string) $arg;
358	356	$str = htmlspecialchars(substr($arg, 0, 16));
359	357	if (strlen($arg) > 16) $str .= '…';
360	358	$args[] = "'" . $str . "'";
361	359	}
362	360	}
363	361	}
364		- $html .= '(' . implode(', ',$args) . ')'
	362	+ $html .= '(' . implode(', ', $args) . ')'
365	363	. '</td>'
366	364	. '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
367	365	. ':' . (isset($v['line']) ? $v['line'] : 'unknown')
368	366	. '</td></tr>' . "\n";
369	367	}
370		- $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
	368	+ $html .= '<tr><td style="text-align: center;">' . ($k + 1) . '</td>'
371	369	. '<td>{main}</td>'
372	370	. '<td> </td></tr>' . "\n"
373	371	. '</table>';

		@@ -117,6 +117,8 @@
		block discarded – undo
117	117	* @param string exception message
118	118	* @param int\|Exception\|PEAR_Error\|array\|null exception cause
119	119	* @param int\|null exception code or null
	120	+ * @param string\|null $message
	121	+ * @param integer $p2
120	122	*/
121	123	public function __construct($message, $p2 = null, $p3 = null)
122	124	{

		@@ -18,28 +18,28 @@
		block discarded – undo
18	18	}
19	19
20	20	public function getResponseCode() {
21		- if($this->response)
	21	+ if ($this->response)
22	22	{
23	23	return $this->response->getStatus();
24	24	}
25	25	}
26	26
27	27	public function getResponseHeader() {
28		- if($this->response)
	28	+ if ($this->response)
29	29	{
30	30	return $this->response->getHeader();
31	31	}
32	32	}
33	33
34	34	public function getResponseBody() {
35		- if($this->response)
	35	+ if ($this->response)
36	36	{
37	37	return $this->response->getBody();
38	38	}
39	39	}
40	40
41	41	public function getResponseCookies() {
42		- if($this->response)
	42	+ if ($this->response)
43	43	{
44	44	return $this->response->getCookies();
45	45	}

		@@ -1,45 +1,45 @@ discard block
		block discarded – undo
1	1	<?php
2	2	/**
3		- * Base class for HTTP_Request2 adapters
4		- *
5		- * PHP version 5
6		- *
7		- * LICENSE:
8		- *
9		- * Copyright (c) 2008, 2009, Alexey Borzov <[email protected]>
10		- * All rights reserved.
11		- *
12		- * Redistribution and use in source and binary forms, with or without
13		- * modification, are permitted provided that the following conditions
14		- * are met:
15		- *
16		- * * Redistributions of source code must retain the above copyright
17		- * notice, this list of conditions and the following disclaimer.
18		- * * Redistributions in binary form must reproduce the above copyright
19		- * notice, this list of conditions and the following disclaimer in the
20		- * documentation and/or other materials provided with the distribution.
21		- * * The names of the authors may not be used to endorse or promote products
22		- * derived from this software without specific prior written permission.
23		- *
24		- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
25		- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
26		- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
27		- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
28		- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
29		- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
30		- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
31		- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
32		- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
33		- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
34		- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35		- *
36		- * @category HTTP
37		- * @package HTTP_Request2
38		- * @author Alexey Borzov <[email protected]>
39		- * @license http://opensource.org/licenses/bsd-license.php New BSD License
40		- * @version SVN: $Id: Adapter.php 291118 2009-11-21 17:58:23Z avb $
41		- * @link http://pear.php.net/package/HTTP_Request2
42		- */
	3	+ * Base class for HTTP_Request2 adapters
	4	+ *
	5	+ * PHP version 5
	6	+ *
	7	+ * LICENSE:
	8	+ *
	9	+ * Copyright (c) 2008, 2009, Alexey Borzov <[email protected]>
	10	+ * All rights reserved.
	11	+ *
	12	+ * Redistribution and use in source and binary forms, with or without
	13	+ * modification, are permitted provided that the following conditions
	14	+ * are met:
	15	+ *
	16	+ * * Redistributions of source code must retain the above copyright
	17	+ * notice, this list of conditions and the following disclaimer.
	18	+ * * Redistributions in binary form must reproduce the above copyright
	19	+ * notice, this list of conditions and the following disclaimer in the
	20	+ * documentation and/or other materials provided with the distribution.
	21	+ * * The names of the authors may not be used to endorse or promote products
	22	+ * derived from this software without specific prior written permission.
	23	+ *
	24	+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
	25	+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
	26	+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	27	+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
	28	+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
	29	+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
	30	+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
	31	+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
	32	+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
	33	+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
	34	+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	35	+ *
	36	+ * @category HTTP
	37	+ * @package HTTP_Request2
	38	+ * @author Alexey Borzov <[email protected]>
	39	+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
	40	+ * @version SVN: $Id: Adapter.php 291118 2009-11-21 17:58:23Z avb $
	41	+ * @link http://pear.php.net/package/HTTP_Request2
	42	+ */
43	43
44	44	/**
45	45	* Class representing a HTTP response
		@@ -64,7 +64,7 @@ discard block
		block discarded – undo
64	64	* A list of methods that MUST NOT have a request body, per RFC 2616
65	65	* @var array
66	66	*/
67		- protected static $bodyDisallowed = array('TRACE');
	67	+ protected static $bodyDisallowed = array('TRACE');
68	68
69	69	/**
70	70	* Methods having defined semantics for request body
		@@ -76,26 +76,26 @@ discard block
		block discarded – undo
76	76	* @link http://pear.php.net/bugs/bug.php?id=12900
77	77	* @link http://pear.php.net/bugs/bug.php?id=14740
78	78	*/
79		- protected static $bodyRequired = array('POST', 'PUT');
	79	+ protected static $bodyRequired = array('POST', 'PUT');
80	80
81	81	/**
82	82	* Request being sent
83	83	* @var HTTP_Request2
84	84	*/
85		- protected $request;
	85	+ protected $request;
86	86
87	87	/**
88	88	* Request body
89	89	* @var string\|resource\|HTTP_Request2_MultipartBody
90	90	* @see HTTP_Request2::getBody()
91	91	*/
92		- protected $requestBody;
	92	+ protected $requestBody;
93	93
94	94	/**
95	95	* Length of the request body
96	96	* @var integer
97	97	*/
98		- protected $contentLength;
	98	+ protected $contentLength;
99	99
100	100	/**
101	101	* Sends request to the remote server and returns its response
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	* @return HTTP_Request2_Response
105	105	* @throws HTTP_Request2_Exception
106	106	*/
107		- abstract public function sendRequest(HTTP_Request2 $request);
	107	+ abstract public function sendRequest(HTTP_Request2 $request);
108	108
109	109	/**
110	110	* Calculates length of the request body, adds proper headers
		@@ -113,42 +113,42 @@ discard block
		block discarded – undo
113	113	* add proper 'Content-Length' and 'Content-Type' headers
114	114	* to this array (or remove them if not needed)
115	115	*/
116		- protected function calculateRequestLength(&$headers)
117		- {
118		- $this->requestBody = $this->request->getBody();
	116	+ protected function calculateRequestLength(&$headers)
	117	+ {
	118	+ $this->requestBody = $this->request->getBody();
119	119
120		- if (is_string($this->requestBody)) {
121		- $this->contentLength = strlen($this->requestBody);
122		- } elseif (is_resource($this->requestBody)) {
123		- $stat = fstat($this->requestBody);
124		- $this->contentLength = $stat['size'];
125		- rewind($this->requestBody);
126		- } else {
127		- $this->contentLength = $this->requestBody->getLength();
128		- $headers['content-type'] = 'multipart/form-data; boundary=' .
129		- $this->requestBody->getBoundary();
130		- $this->requestBody->rewind();
131		- }
	120	+ if (is_string($this->requestBody)) {
	121	+ $this->contentLength = strlen($this->requestBody);
	122	+ } elseif (is_resource($this->requestBody)) {
	123	+ $stat = fstat($this->requestBody);
	124	+ $this->contentLength = $stat['size'];
	125	+ rewind($this->requestBody);
	126	+ } else {
	127	+ $this->contentLength = $this->requestBody->getLength();
	128	+ $headers['content-type'] = 'multipart/form-data; boundary=' .
	129	+ $this->requestBody->getBoundary();
	130	+ $this->requestBody->rewind();
	131	+ }
132	132
133		- if (in_array($this->request->getMethod(), self::$bodyDisallowed) \|\|
134		- 0 == $this->contentLength
135		- ) {
136		- // No body: send a Content-Length header nonetheless (request #12900),
137		- // but do that only for methods that require a body (bug #14740)
138		- if (in_array($this->request->getMethod(), self::$bodyRequired)) {
139		- $headers['content-length'] = 0;
140		- } else {
141		- unset($headers['content-length']);
142		- // if the method doesn't require a body and doesn't have a
143		- // body, don't send a Content-Type header. (request #16799)
144		- unset($headers['content-type']);
145		- }
146		- } else {
147		- if (empty($headers['content-type'])) {
148		- $headers['content-type'] = 'application/x-www-form-urlencoded';
149		- }
150		- $headers['content-length'] = $this->contentLength;
151		- }
152		- }
	133	+ if (in_array($this->request->getMethod(), self::$bodyDisallowed) \|\|
	134	+ 0 == $this->contentLength
	135	+ ) {
	136	+ // No body: send a Content-Length header nonetheless (request #12900),
	137	+ // but do that only for methods that require a body (bug #14740)
	138	+ if (in_array($this->request->getMethod(), self::$bodyRequired)) {
	139	+ $headers['content-length'] = 0;
	140	+ } else {
	141	+ unset($headers['content-length']);
	142	+ // if the method doesn't require a body and doesn't have a
	143	+ // body, don't send a Content-Type header. (request #16799)
	144	+ unset($headers['content-type']);
	145	+ }
	146	+ } else {
	147	+ if (empty($headers['content-type'])) {
	148	+ $headers['content-type'] = 'application/x-www-form-urlencoded';
	149	+ }
	150	+ $headers['content-length'] = $this->contentLength;
	151	+ }
	152	+ }
153	153	}
154	154	?>

		@@ -216,7 +216,7 @@ discard block
		block discarded – undo
216	216	$headers = $this->request->getHeaders();
217	217	$reqHost = $this->request->getUrl()->getHost();
218	218	if (!($reqPort = $this->request->getUrl()->getPort())) {
219		- $reqPort = $secure? 443: 80;
	219	+ $reqPort = $secure ? 443 : 80;
220	220	}
221	221
222	222	if ($host = $this->request->getConfig('proxy_host')) {
		@@ -253,7 +253,7 @@ discard block
		block discarded – undo
253	253	empty($headers['connection'])) \|\|
254	254	(!empty($headers['connection']) &&
255	255	'Keep-Alive' == $headers['connection']);
256		- $host = ((!$secure \|\| $proxy)? 'tcp://': 'ssl://') . $host;
	256	+ $host = ((!$secure \|\| $proxy) ? 'tcp://' : 'ssl://') . $host;
257	257
258	258	$options = array();
259	259	if ($secure \|\| $tunnel) {
		@@ -274,8 +274,8 @@ discard block
		block discarded – undo
274	274	// Changing SSL context options after connection is established does not
275	275	// work, we need a new connection if options change
276	276	$remote = $host . ':' . $port;
277		- $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
278		- (empty($options)? '': ':' . serialize($options));
	277	+ $socketKey = $remote . (($secure && $proxy) ? "->{$reqHost}:{$reqPort}" : '') .
	278	+ (empty($options) ? '' : ':' . serialize($options));
279	279	unset($this->socket);
280	280
281	281	// We use persistent connections and have a connected socket?
		@@ -283,14 +283,14 @@ discard block
		block discarded – undo
283	283	if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
284	284	!feof(self::$sockets[$socketKey])
285	285	) {
286		- $this->socket =& self::$sockets[$socketKey];
	286	+ $this->socket = & self::$sockets[$socketKey];
287	287
288	288	} elseif ($secure && $proxy && !$tunnel) {
289	289	$this->establishTunnel();
290	290	$this->request->setLastEvent(
291	291	'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
292	292	);
293		- self::$sockets[$socketKey] =& $this->socket;
	293	+ self::$sockets[$socketKey] = & $this->socket;
294	294
295	295	} else {
296	296	// Set SSL context options if doing HTTPS request or creating a tunnel
		@@ -313,7 +313,7 @@ discard block
		block discarded – undo
313	313	);
314	314	}
315	315	$this->request->setLastEvent('connect', $remote);
316		- self::$sockets[$socketKey] =& $this->socket;
	316	+ self::$sockets[$socketKey] = & $this->socket;
317	317	}
318	318	return $keepAlive;
319	319	}
		@@ -515,7 +515,7 @@ discard block
		block discarded – undo
515	515	// probably credentials are invalid
516	516	$ret = false;
517	517	}
518		- self::$challenges[$prefix] =& $challenge;
	518	+ self::$challenges[$prefix] = & $challenge;
519	519	}
520	520	return $ret;
521	521	}
		@@ -696,12 +696,10 @@ discard block
		block discarded – undo
696	696	'nonce="' . $challenge['nonce'] . '", ' .
697	697	'uri="' . $url . '", ' .
698	698	'response="' . $digest . '"' .
699		- (!empty($challenge['opaque'])?
700		- ', opaque="' . $challenge['opaque'] . '"':
701		- '') .
702		- (!empty($challenge['qop'])?
703		- ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
704		- '');
	699	+ (!empty($challenge['opaque']) ?
	700	+ ', opaque="' . $challenge['opaque'] . '"' : '') .
	701	+ (!empty($challenge['qop']) ?
	702	+ ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"' : '');
705	703	}
706	704
707	705	/**
		@@ -725,17 +723,16 @@ discard block
		block discarded – undo
725	723
726	724	case HTTP_Request2::AUTH_DIGEST:
727	725	unset($this->serverChallenge);
728		- $fullUrl = ('/' == $requestUrl[0])?
	726	+ $fullUrl = ('/' == $requestUrl[0]) ?
729	727	$this->request->getUrl()->getScheme() . '://' .
730		- $requestHost . $requestUrl:
731		- $requestUrl;
	728	+ $requestHost . $requestUrl : $requestUrl;
732	729	foreach (array_keys(self::$challenges) as $key) {
733	730	if ($key == substr($fullUrl, 0, strlen($key))) {
734	731	$headers['authorization'] = $this->createDigestResponse(
735	732	$auth['user'], $auth['password'],
736	733	$requestUrl, self::$challenges[$key]
737	734	);
738		- $this->serverChallenge =& self::$challenges[$key];
	735	+ $this->serverChallenge = & self::$challenges[$key];
739	736	break;
740	737	}
741	738	}
		@@ -781,7 +778,7 @@ discard block
		block discarded – undo
781	778	$user, $password,
782	779	$requestUrl, self::$challenges[$proxyUrl]
783	780	);
784		- $this->proxyChallenge =& self::$challenges[$proxyUrl];
	781	+ $this->proxyChallenge = & self::$challenges[$proxyUrl];
785	782	}
786	783	break;
787	784
		@@ -807,9 +804,9 @@ discard block
		block discarded – undo
807	804	$connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
808	805	$host = $url->getHost();
809	806
810		- $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
	807	+ $defaultPort = 0 == strcasecmp($url->getScheme(), 'https') ? 443 : 80;
811	808	if (($port = $url->getPort()) && $port != $defaultPort \|\| $connect) {
812		- $host .= ':' . (empty($port)? $defaultPort: $port);
	809	+ $host .= ':' . (empty($port) ? $defaultPort : $port);
813	810	}
814	811	// Do not overwrite explicitly set 'Host' header, see bug #16146
815	812	if (!isset($headers['host'])) {
		@@ -829,7 +826,7 @@ discard block
		block discarded – undo
829	826	}
830	827	$path = $url->getPath();
831	828	$query = $url->getQuery();
832		- $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
	829	+ $requestUrl .= (empty($path) ? '/' : $path) . (empty($query) ? '' : '?' . $query);
833	830	}
834	831
835	832	if ('1.1' == $this->request->getConfig('protocol_version') &&
		@@ -920,7 +917,7 @@ discard block
		block discarded – undo
920	917	// 3. ... If a message is received with both a
921	918	// Transfer-Encoding header field and a Content-Length header field,
922	919	// the latter MUST be ignored.
923		- $toRead = ($chunked \|\| null === $length)? null: $length;
	920	+ $toRead = ($chunked \|\| null === $length) ? null : $length;
924	921	$this->chunkLength = 0;
925	922
926	923	while (!feof($this->socket) && (is_null($toRead) \|\| 0 < $toRead)) {

xpressengine / xe-core

GitHub Access Token became invalid

Pull Request — develop (#1782)

Status

Category

Switch Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +591 added lines, -591 removed lines patch added patch discarded remove patch

Indentation +108 added lines, -108 removed lines patch added patch discarded remove patch

Switch Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +238 added lines, -238 removed lines patch added patch discarded remove patch

Indentation +963 added lines, -963 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -10 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines patch added patch discarded remove patch

Braces +14 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +291 added lines, -291 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +81 added lines, -81 removed lines patch added patch discarded remove patch

Indentation +97 added lines, -97 removed lines patch added patch discarded remove patch

Indentation +759 added lines, -759 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -23 removed lines patch added patch discarded remove patch