Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

php-sabre-http.spec Changed

@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    c4c24f547a5509c6c661b11ecf4ff524d2bf6a44
+%global gh_commit    6b06c03376219b3d608e1f878514ec105ed1b577
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     fruux
 %global gh_project   sabre-http
@@ -15,7 +15,7 @@
 
 Name:           php-%{gh_project}
 Summary:        Library for dealing with http requests and responses
-Version:        2.0.4
+Version:        3.0.5
 Release:        1%{?dist}
 
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -85,7 +85,8 @@
 
 
 %prep
-%setup -q -n %{gh_project}-%{gh_commit}
+##%%setup -q -n %{gh_project}-%{gh_commit}
+%setup -q -n %{gh_project}-%{version}
 
 : Create trivial PSR0 autoloader
 cat <<EOF | tee psr0.php
@@ -103,8 +104,8 @@
 
 %install
 # Install as a PSR-0 library
-mkdir -p %{buildroot}%{_datadir}/php
-cp -pr lib/Sabre %{buildroot}%{_datadir}/php/Sabre
+mkdir -p %{buildroot}%{_datadir}/php/Sabre/HTTP
+cp -pr lib/* %{buildroot}%{_datadir}/php/Sabre/HTTP/.
 
 
 %check
@@ -121,7 +122,7 @@
 
 
 %files
-%doc ChangeLog composer.json LICENSE README.md
+%doc ChangeLog.md composer.json LICENSE README.md
 %{_datadir}/php/Sabre/HTTP

sabre-http-2.0.4.tar.gz/ChangeLog Deleted

@@ -1,89 +0,0 @@
-2.0.4-stable (2014-07-14)
-	* Changed: No longer escaping @ in urls when it's not needed.
-	* Fixed: #7: Client now correctly deals with responses without a body.
-
-2.0.3-stable (2014-04-17)
-	* Now works on hhvm!
-	* Fixed: Now throwing an error when a Request object is being created with
-	  arguments that were valid for sabre/http 1.0. Hopefully this will aid
-	  with debugging for upgraders.
-
-2.0.2-stable (2014-02-09)
-	* Fixed: Potential security problem in the client.
-
-2.0.1-stable (2014-01-09)
-	* Fixed: getBodyAsString on an empty body now works.
-	* Fixed: Version string
-
-2.0.0-stable (2014-01-08)
-	* Removed: Request::createFromPHPRequest. This is now handled by
-	  Sapi::getRequest.
-
-2.0.0alpha6 (2014-01-03)
-	* Added: Asynchronous HTTP client. See examples/asyncclient.php.
-	* Fixed: Issue #4: Don't escape colon (:) when it's not needed.
-	* Fixed: Fixed a bug in the content negotation script.
-	* Fixed: Fallback for when CURLOPT_POSTREDIR is not defined (mainly for
-	  hhvm).
-	* Added: The Request and Response object now have a __toString() method
-	  that serializes the objects into a standard HTTP message. This is mainly
-	  for debugging purposes.
-	* Changed: Added Response::getStatusText(). This method returns the
-	  human-readable HTTP status message. This part has been removed from
-	  Response::getStatus(), which now always returns just the status code as
-	  an int.
-	* Changed: Response::send() is now Sapi::sendResponse($response).
-	* Changed: Request::createFromPHPRequest is now Sapi::getRequest().
-	* Changed: Message::getBodyAsStream and Message::getBodyAsString were
-	  added. The existing Message::getBody changed it's behavior, so be
-	  careful.
-
-2.0.0alpha5 (2013-11-07)
-	* Added: HTTP Status 451 Unavailable For Legal Reasons. Fight government
-	  censorship!
-	* Added: Ability to catch and retry http requests in the client when a
-	  curl error occurs.
-	* Changed: Request::getPath does not return the query part of the url, so
-	  everything after the ? is stripped.
-	* Added: a reverse proxy example.
-
-2.0.0alpha4 (2013-08-07)
-	* Fixed: Doing a GET request with the client uses the last used HTTP
-	  method instead.
-	* Added: HttpException
-	* Added: The Client class can now automatically emit exceptions when HTTP
-	  errors occurred.
-
-2.0.0alpha3 (2013-07-24)
-	* Changed: Now depends on sabre/event package.
-	* Changed: setHeaders() now overwrites any existing http headers.
-	* Added: getQueryParameters to RequestInterface.
-	* Added: Util::negotiate.
-	* Added: RequestDecorator, ResponseDecorator.
-	* Added: A very simple HTTP client.
-	* Added: addHeaders() to append a list of new headers.
-	* Fixed: Not erroring on unknown HTTP status codes.
-	* Fixed: Throwing exceptions on invalid HTTP status codes (not 3 digits).
-	* Fixed: Much better README.md
-	* Changed: getBody() now uses a bitfield to specify what type to return.
-
-2.0.0alpha2 (2013-07-02)
-	* Added: Digest & AWS Authentication.
-	* Added: Message::getHttpVersion and Message::setHttpVersion.
-	* Added: Request::setRawServerArray, getRawServerValue.
-	* Added: Request::createFromPHPRequest
-	* Added: Response::send
-	* Added: Request::getQueryParameters
-	* Added: Utility for dealing with HTTP dates.
-	* Added: Request::setPostData and Request::getPostData.
-	* Added: Request::setAbsoluteUrl and Request::getAbsoluteUrl.
-	* Added: URLUtil, methods for calculation relative and base urls.
-	* Removed: Response::sendBody
-
-2.0.0alpha1 (2012-10-07)
-	* Fixed: Lots of small naming improvements
-	* Added: Introduction of Message, MessageInterface, Response,
-	  ResponseInterface.
-
-Before 2.0.0, this package was built-into SabreDAV, where it first appeared in
-January 2009.

sabre-http-2.0.4.tar.gz/bin/EMPTY Deleted

sabre-http-2.0.4.tar.gz/lib/Sabre Deleted

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP Deleted

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Auth Deleted

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Auth/AWS.php Deleted

@@ -1,229 +0,0 @@
-<?php
-
-namespace Sabre\HTTP\Auth;
-
-use Sabre\HTTP\Util;
-
-/**
- * HTTP AWS Authentication handler
- *
- * Use this class to leverage amazon's AWS authentication header
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class AWS extends AbstractAuth {
-
-    /**
-     * The signature supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $signature = null;
-
-    /**
-     * The accesskey supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $accessKey = null;
-
-    /**
-     * An error code, if any
-     *
-     * This value will be filled with one of the ERR_* constants
-     *
-     * @var int
-     */
-    public $errorCode = 0;
-
-    const ERR_NOAWSHEADER = 1;
-    const ERR_MD5CHECKSUMWRONG = 2;
-    const ERR_INVALIDDATEFORMAT = 3;
-    const ERR_REQUESTTIMESKEWED = 4;
-    const ERR_INVALIDSIGNATURE = 5;
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return bool
-     */
-    public function init() {
-
-        $authHeader = $this->request->getHeader('Authorization');
-        $authHeader = explode(' ',$authHeader);
-
-        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
-            $this->errorCode = self::ERR_NOAWSHEADER;
-             return false;
-        }
-
-        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
-
-        return true;
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getAccessKey() {
-
-        return $this->accessKey;
-
-    }
-
-    /**
-     * Validates the signature based on the secretKey
-     *
-     * @param string $secretKey
-     * @return bool
-     */
-    public function validate($secretKey) {
-
-        $contentMD5 = $this->request->getHeader('Content-MD5');
-
-        if ($contentMD5) {
-            // We need to validate the integrity of the request
-            $body = $this->request->getBody(true);
-            $this->request->setBody($body,true);
-
-            if ($contentMD5!=base64_encode(md5($body,true))) {
-                // content-md5 header did not match md5 signature of body
-                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
-                return false;
-            }
-
-        }
-
-        if (!$requestDate = $this->request->getHeader('x-amz-date'))
-            $requestDate = $this->request->getHeader('Date');
-
-        if (!$this->validateRFC2616Date($requestDate))
-            return false;
-
-        $amzHeaders = $this->getAmzHeaders();
-
-        $signature = base64_encode(
-            $this->hmacsha1($secretKey,
-                $this->request->getMethod() . "\n" .
-                $contentMD5 . "\n" .
-                $this->request->getHeader('Content-type') . "\n" .
-                $requestDate . "\n" .
-                $amzHeaders .
-                $this->request->getUrl()
-            )
-        );
-
-        if ($this->signature != $signature) {
-
-            $this->errorCode = self::ERR_INVALIDSIGNATURE;
-            return false;
-
-        }
-
-        return true;
-
-    }
-
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->response->setHeader('WWW-Authenticate','AWS');
-        $this->response->setStatus(401);
-
-    }
-
-    /**
-     * Makes sure the supplied value is a valid RFC2616 date.
-     *
-     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
-     * user just supplied the word 'now' for the date header.
-     *
-     * This function also makes sure the Date header is within 15 minutes of the operating
-     * system date, to prevent replay attacks.
-     *
-     * @param string $dateHeader
-     * @return bool
-     */
-    protected function validateRFC2616Date($dateHeader) {
-
-        $date = Util::parseHTTPDate($dateHeader);
-
-        // Unknown format
-        if (!$date) {
-            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
-            return false;
-        }
-
-        $min = new \DateTime('-15 minutes');
-        $max = new \DateTime('+15 minutes');
-
-        // We allow 15 minutes around the current date/time
-        if ($date > $max || $date < $min) {
-            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
-            return false;
-        }
-
-        return $date;
-
-    }
-
-    /**
-     * Returns a list of AMZ headers
-     *
-     * @return string
-     */
-    protected function getAmzHeaders() {
-
-        $amzHeaders = array();
-        $headers = $this->request->getHeaders();
-        foreach($headers as $headerName => $headerValue) {
-            if (strpos(strtolower($headerName),'x-amz-')===0) {
-                $amzHeaders[strtolower($headerName)] = str_replace(array("\r\n"),array(' '),$headerValue) . "\n";
-            }
-        }
-        ksort($amzHeaders);
-

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Auth/AbstractAuth.php Deleted

@@ -1,74 +0,0 @@
-<?php
-
-namespace Sabre\HTTP\Auth;
-
-use
-    Sabre\HTTP\RequestInterface,
-    Sabre\HTTP\ResponseInterface;
-
-/**
- * HTTP Authentication base class.
- *
- * This class provides some common functionality for the various base classes.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class AbstractAuth {
-
-    /**
-     * Authentication realm
-     *
-     * @var string
-     */
-    protected $realm;
-
-    /**
-     * Request object
-     *
-     * @var RequestInterface
-     */
-    protected $request;
-
-    /**
-     * Response object
-     *
-     * @var ResponseInterface
-     */
-    protected $response;
-
-    /**
-     * Creates the object
-     *
-     * @param string $realm
-     * @return void
-     */
-    public function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
-
-        $this->realm = $realm;
-        $this->request = $request;
-        $this->response = $response;
-
-    }
-
-    /**
-     * This method sends the needed HTTP header and statuscode (401) to force
-     * the user to login.
-     *
-     * @return void
-     */
-    abstract public function requireLogin();
-
-    /**
-     * Returns the HTTP realm 
-     * 
-     * @return string
-     */
-    public function getRealm() {
-
-        return $this->realm;
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Auth/Basic.php Deleted

@@ -1,61 +0,0 @@
-<?php
-
-namespace Sabre\HTTP\Auth;
-
-use
-    Sabre\HTTP\RequestInterface,
-    Sabre\HTTP\ResponseInterface;
-
-/**
- * HTTP Basic authentication utility.
- *
- * This class helps you setup basic auth. The process is fairly simple:
- *
- * 1. Instantiate the class.
- * 2. Call getCredentials (this will return null or a user/pass pair)
- * 3. If you didn't get valid credentials, call 'requireLogin'
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Basic extends AbstractAuth {
-
-    /**
-     * This method returns a numeric array with a username and password as the
-     * only elements.
-     *
-     * If no credentials were found, this method returns null.
-     *
-     * @return null|array
-     */
-    public function getCredentials() {
-
-        $auth = $this->request->getHeader('Authorization');
-
-        if (!$auth) {
-            return null;
-        }
-
-        if (strtolower(substr($auth,0,6))!=='basic ') {
-            return null;
-        }
-
-        return explode(':',base64_decode(substr($auth, 6)), 2);
-
-    }
-
-    /**
-     * This method sends the needed HTTP header and statuscode (401) to force
-     * the user to login.
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->response->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
-        $this->response->setStatus(401);
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Auth/Digest.php Deleted

@@ -1,232 +0,0 @@
-<?php
-
-namespace Sabre\HTTP\Auth;
-
-use
-    Sabre\HTTP\RequestInterface,
-    Sabre\HTTP\ResponseInterface;
-
-/**
- * HTTP Digest Authentication handler
- *
- * Use this class for easy http digest authentication.
- * Instructions:
- *
- *  1. Create the object
- *  2. Call the setRealm() method with the realm you plan to use
- *  3. Call the init method function.
- *  4. Call the getUserName() function. This function may return null if no
- *     authentication information was supplied. Based on the username you
- *     should check your internal database for either the associated password,
- *     or the so-called A1 hash of the digest.
- *  5. Call either validatePassword() or validateA1(). This will return true
- *     or false.
- *  6. To make sure an authentication prompt is displayed, call the
- *     requireLogin() method.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Digest extends AbstractAuth {
-
-    /**
-     * These constants are used in setQOP();
-     */
-    const QOP_AUTH = 1;
-    const QOP_AUTHINT = 2;
-
-    protected $nonce;
-    protected $opaque;
-    protected $digestParts;
-    protected $A1;
-    protected $qop = self::QOP_AUTH;
-
-    /**
-     * Initializes the object
-     */
-    public function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
-
-        $this->nonce = uniqid();
-        $this->opaque = md5($realm);
-        parent::__construct($realm, $request, $response);
-
-    }
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return void
-     */
-    public function init() {
-
-        $digest = $this->getDigest();
-        $this->digestParts = $this->parseDigest($digest);
-
-    }
-
-    /**
-     * Sets the quality of protection value.
-     *
-     * Possible values are:
-     *   Sabre\HTTP\DigestAuth::QOP_AUTH
-     *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
-     *
-     * Multiple values can be specified using logical OR.
-     *
-     * QOP_AUTHINT ensures integrity of the request body, but this is not
-     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
-     * request body to be md5'ed, which can put strains on CPU and memory.
-     *
-     * @param int $qop
-     * @return void
-     */
-    public function setQOP($qop) {
-
-        $this->qop = $qop;
-
-    }
-
-    /**
-     * Validates the user.
-     *
-     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
-     *
-     * @param string $A1
-     * @return bool
-     */
-    public function validateA1($A1) {
-
-        $this->A1 = $A1;
-        return $this->validate();
-
-    }
-
-    /**
-     * Validates authentication through a password. The actual password must be provided here.
-     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
-     *
-     * @param string $password
-     * @return bool
-     */
-    public function validatePassword($password) {
-
-        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
-        return $this->validate();
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getUsername() {
-
-        return $this->digestParts['username'];
-
-    }
-
-    /**
-     * Validates the digest challenge
-     *
-     * @return bool
-     */
-    protected function validate() {
-
-        $A2 = $this->request->getMethod() . ':' . $this->digestParts['uri'];
-
-        if ($this->digestParts['qop']=='auth-int') {
-            // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
-            // We need to add an md5 of the entire request body to the A2 part of the hash
-            $body = $this->request->getBody($asString = true);
-            $this->request->setBody($body);
-            $A2 .= ':' . md5($body);
-        } else {
-
-            // We need to make sure we support this qop value
-            if (!($this->qop & self::QOP_AUTH)) return false;
-        }
-
-        $A2 = md5($A2);
-
-        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
-
-        return $this->digestParts['response']==$validResponse;
-
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $qop = '';
-        switch($this->qop) {
-            case self::QOP_AUTH    :
-                $qop = 'auth';
-                break;
-            case self::QOP_AUTHINT :
-                $qop = 'auth-int';
-                break;
-            case self::QOP_AUTH | self::QOP_AUTHINT :
-                $qop = 'auth,auth-int';
-                break;
-        }
-
-        $this->response->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
-        $this->response->setStatus(401);
-
-    }
-
-
-    /**
-     * This method returns the full digest string.
-     *
-     * It should be compatibile with mod_php format and other webservers.
-     *
-     * If the header could not be found, null will be returned
-     *
-     * @return mixed
-     */

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Client.php Deleted

@@ -1,554 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-use
-    Sabre\Event\EventEmitter;
-
-/**
- * A rudimentary HTTP client.
- *
- * This object wraps PHP's curl extension and provides an easy way to send it a
- * Request object, and return a Response object.
- *
- * This is by no means intended as the next best HTTP client, but it does the
- * job and provides a simple integration with the rest of sabre/http.
- *
- * This client emits the following events:
- *   beforeRequest(RequestInterface $request)
- *   afterRequest(RequestInterface $request, ResponseInterface $response)
- *   error(RequestInterface $request, ResponseInterface $response, bool &$retry, int $retryCount)
- *
- * The beforeRequest event allows you to do some last minute changes to the
- * request before it's done, such as adding authentication headers.
- *
- * The afterRequest event will be emitted after the request is completed
- * succesfully.
- *
- * If a HTTP error is returned (status code higher than 399) the error event is
- * triggered. It's possible using this event to retry the request, by setting
- * retry to true.
- *
- * The amount of times a request has retried is passed as $retryCount, which
- * can be used to avoid retrying indefinitely. The first time the event is
- * called, this will be 0.
- *
- * It's also possible to intercept specific http errors, by subscribing to for
- * example 'error:401'.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH. All rights reserved.
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Client extends EventEmitter {
-
-    /**
-     * List of curl settings
-     *
-     * @var array
-     */
-    protected $curlSettings = [];
-
-    /**
-     * Wether or not exceptions should be thrown when a HTTP error is returned.
-     *
-     * @var bool
-     */
-    protected $throwExceptions = false;
-
-    /**
-     * Initializes the client.
-     *
-     * @return void
-     */
-    public function __construct() {
-
-        // hhvm compatibility.
-        if (!defined('CURLOPT_POSTREDIR')) {
-            define('CURLOPT_POSTREDIR', 161);
-        }
-
-        $this->curlSettings = [
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_HEADER => true,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_MAXREDIRS => 5,
-            CURLOPT_POSTREDIR => 3,
-        ];
-
-    }
-
-    /**
-     * Sends a request to a HTTP server, and returns a response.
-     *
-     * @param RequestInterface $request
-     * @return ResponseInterface
-     */
-    public function send(RequestInterface $request) {
-
-        $this->emit('beforeRequest', [$request]);
-
-        $retryCount = 0;
-
-        do {
-
-            $retry = false;
-
-            try {
-                $response = $this->doRequest($request);
-
-                $code = (int)$response->getStatus();
-
-                // This was a HTTP error
-                if ($code >= 400) {
-
-                    $this->emit('error', [$request, $response, &$retry, $retryCount]);
-                    $this->emit('error:' . $code, [$request, $response, &$retry, $retryCount]);
-
-                }
-
-            } catch (ClientException $e) {
-                $this->emit('exception', [$request, $e, &$retry, $retryCount]);
-
-                // If retry was still set to false, it means no event handler
-                // dealt with the problem. In this case we just re-throw the
-                // exception.
-                if (!$retry) {
-                    throw $e;
-                }
-            }
-            if ($retry) {
-                $retryCount++;
-            }
-
-        } while ($retry);
-
-        $this->emit('afterRequest', [$request, $response]);
-
-        if ($this->throwExceptions && $code > 399) {
-            throw new ClientHttpException($response);
-        }
-
-        return $response;
-
-    }
-
-    /**
-     * Sends a HTTP request asynchronously.
-     *
-     * Due to the nature of PHP, you must from time to time poll to see if any
-     * new responses came in.
-     *
-     * After calling sendAsync, you must therefore occasionally call the poll()
-     * method, or wait().
-     *
-     * @param RequestInterface $request
-     * @param callable $success
-     * @param callable $error
-     * @return void
-     */
-    public function sendAsync(RequestInterface $request, callable $success = null, callable $error = null) {
-
-        $this->emit('beforeRequest', [$request]);
-        $this->sendAsyncInternal($request, $success, $error);
-        $this->poll();
-
-    }
-
-
-    /**
-     * This method checks if any http requests have gotten results, and if so,
-     * call the appropriate success or error handlers.
-     *
-     * This method will return true if there are still requests waiting to
-     * return, and false if all the work is done.
-     *
-     * @return bool
-     */
-    public function poll() {
-
-        // nothing to do?
-        if(!$this->curlMultiMap) {
-            return false;
-        }
-
-        do {
-            $r = curl_multi_exec(
-                $this->curlMultiHandle,
-                $stillRunning
-            );
-        } while ($r === CURLM_CALL_MULTI_PERFORM);
-
-        do {
-
-            messageQueue:
-
-            $status = curl_multi_info_read(
-                $this->curlMultiHandle,
-                $messagesInQueue
-            );
-            if ($status && $status['msg'] === CURLMSG_DONE) {
-
-                $resourceId = intval($status['handle']);
-                list(
-                    $request,
-                    $successCallback,
-                    $errorCallback,
-                    $retryCount,
-                ) = $this->curlMultiMap[$resourceId];
-

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/ClientException.php Deleted

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/ClientHttpException.php Deleted

@@ -1,58 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * This exception represents a HTTP error coming from the Client.
- *
- * By default the Client will not emit these, this has to be explicitly enabled
- * with the setThrowExceptions method.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH. All rights reserved.
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class ClientHttpException extends \Exception implements HttpException {
-
-    /**
-     * Response object
-     *
-     * @var ResponseInterface
-     */
-    protected $response;
-
-    /**
-     * Constructor
-     *
-     * @param ResponseInterface $response
-     */
-    public function __construct(ResponseInterface $response) {
-
-        $this->response = $response;
-        parent::__construct($response->getStatusText(), $response->getStatus());
-
-    }
-
-    /**
-     * The http status code for the error.
-     *
-     * @return int
-     */
-    public function getHttpStatus() {
-
-        return $this->response->getStatus();
-
-    }
-
-    /**
-     * Returns the full response object.
-     *
-     * @return ResponseInterface
-     */
-    public function getResponse() {
-
-        return $this->response;
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/HttpException.php Deleted

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Message.php Deleted

@@ -1,229 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * This is the abstract base class for both the Request and Response objects.
- *
- * This object contains a few simple methods that are shared by both.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Message implements MessageInterface {
-
-    /**
-     * Request body
-     *
-     * This should be a stream resource
-     *
-     * @var resource
-     */
-    protected $body;
-
-    /**
-     * Contains the list of HTTP headers
-     *
-     * @var array
-     */
-    protected $headers = [];
-
-    /**
-     * HTTP message version (1.0 or 1.1)
-     *
-     * @var string
-     */
-    protected $httpVersion = '1.1';
-
-    /**
-     * Returns the body as a readable stream resource.
-     *
-     * Note that the stream may not be rewindable, and therefore may only be
-     * read once.
-     *
-     * @return resource
-     */
-    public function getBodyAsStream() {
-
-        $body = $this->getBody();
-        if (is_string($body) || is_null($body)) {
-            $stream = fopen('php://temp', 'r+');
-            fwrite($stream, $body);
-            rewind($stream);
-            return $stream;
-        } else {
-            return $body;
-        }
-
-    }
-
-    /**
-     * Returns the body as a string.
-     *
-     * Note that because the underlying data may be based on a stream, this
-     * method could only work correctly the first time.
-     *
-     * @return string
-     */
-    public function getBodyAsString() {
-
-        $body = $this->getBody();
-        if (is_string($body)) {
-            return $body;
-        } elseif (is_null($body)) {
-            return '';
-        } else {
-            return stream_get_contents($body);
-        }
-
-    }
-
-    /**
-     * Returns the message body, as it's internal representation.
-     *
-     * This could be either a string or a stream.
-     *
-     * @return resource|string
-     */
-    public function getBody() {
-
-        return $this->body;
-
-    }
-
-    /**
-     * Replaces the body resource with a new stream or string.
-     *
-     * @param resource $body
-     */
-    public function setBody($body) {
-
-        $this->body = $body;
-
-    }
-
-    /**
-     * Returns all the HTTP headers as an array.
-     *
-     * @return array
-     */
-    public function getHeaders() {
-
-        return $this->headers;
-
-    }
-
-    /**
-     * Returns a specific HTTP header, based on it's name.
-     *
-     * The name must be treated as case-insensitive.
-     *
-     * If the header does not exist, this method must return null.
-     *
-     * @param string $name
-     * @return string|null
-     */
-    public function getHeader($name) {
-
-        foreach($this->headers as $key=>$value) {
-            if (strtolower($key)===strtolower($name)) {
-                return $value;
-            }
-        }
-
-        return null;
-
-    }
-
-    /**
-     * Sets a new set of HTTP headers.
-     *
-     * This method should append the new headers, not wipe out the existing
-     * ones.
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function setHeaders(array $headers) {
-
-        $this->headers = $headers;
-
-    }
-
-    /**
-     * Adds a new set of HTTP headers.
-     *
-     * Any header specified in the array that already exists will be
-     * overwritten, but any other existing headers will be retained.
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function addHeaders(array $headers) {
-
-        $this->headers = array_merge($this->headers, $headers);
-
-    }
-
-    /**
-     * Updates a HTTP header.
-     *
-     * The case-sensitity of the name value must be retained as-is.
-     *
-     * @param string $name
-     * @param string $value
-     * @return void
-     */
-    public function setHeader($name, $value) {
-
-        $this->headers[$name] = $value;
-
-    }
-
-    /**
-     * Removes a HTTP header.
-     *
-     * The specified header name must be treated as case-insenstive.
-     * This method should return true if the header was successfully deleted,
-     * and false if the header did not exist.
-     *
-     * @return bool
-     */
-    public function removeHeader($name) {
-
-        foreach($this->headers as $key=>$value) {
-            if (strtolower($key)===strtolower($name)) {
-                unset($this->headers[$key]);
-                return true;
-            }

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/MessageDecoratorTrait.php Deleted

@@ -1,192 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * This trait contains a bunch of methods, shared by both the RequestDecorator
- * and the ResponseDecorator.
- *
- * Didn't seem needed to create a full class for this, so we're just
- * implementing it as a trait.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-trait MessageDecoratorTrait {
-
-    /**
-     * The inner request object.
-     *
-     * All method calls will be forwarded here.
-     *
-     * @var MessageInterface
-     */
-    protected $inner;
-
-    /**
-     * Returns the body as a readable stream resource.
-     *
-     * Note that the stream may not be rewindable, and therefore may only be
-     * read once.
-     *
-     * @return resource
-     */
-    public function getBodyAsStream() {
-
-        return $this->inner->getBodyAsStream();
-
-    }
-
-    /**
-     * Returns the body as a string.
-     *
-     * Note that because the underlying data may be based on a stream, this
-     * method could only work correctly the first time.
-     *
-     * @return string
-     */
-    public function getBodyAsString() {
-
-        return $this->inner->getBodyAsString();
-
-    }
-
-    /**
-     * Returns the message body, as it's internal representation.
-     *
-     * This could be either a string or a stream.
-     *
-     * @return resource|string
-     */
-    public function getBody() {
-
-        return $this->inner->getBody();
-
-    }
-
-    /**
-     * Updates the body resource with a new stream.
-     *
-     * @param resource $body
-     * @return void
-     */
-    public function setBody($body) {
-
-        $this->inner->setBody($body);
-
-    }
-
-    /**
-     * Returns all the HTTP headers as an array.
-     *
-     * @return array
-     */
-    public function getHeaders() {
-
-        return $this->inner->getHeaders();
-
-    }
-
-    /**
-     * Returns a specific HTTP header, based on it's name.
-     *
-     * The name must be treated as case-insensitive.
-     *
-     * If the header does not exist, this method must return null.
-     *
-     * @param string $name
-     * @return string|null
-     */
-    public function getHeader($name) {
-
-        return $this->inner->getHeader($name);
-
-    }
-
-    /**
-     * Updates a HTTP header.
-     *
-     * The case-sensitity of the name value must be retained as-is.
-     *
-     * @param string $name
-     * @param string $value
-     * @return void
-     */
-    public function setHeader($name, $value) {
-
-        $this->inner->setHeader($name, $value);
-
-    }
-
-    /**
-     * Resets HTTP headers
-     *
-     * This method overwrites all existing HTTP headers
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function setHeaders(array $headers) {
-
-        $this->inner->setHeaders($headers);
-
-    }
-
-    /**
-     * Adds a new set of HTTP headers.
-     *
-     * Any header specified in the array that already exists will be
-     * overwritten, but any other existing headers will be retained.
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function addHeaders(array $headers) {
-
-        $this->inner->addHeaders($headers);
-
-    }
-
-
-    /**
-     * Removes a HTTP header.
-     *
-     * The specified header name must be treated as case-insenstive.
-     * This method should return true if the header was successfully deleted,
-     * and false if the header did not exist.
-     *
-     * @return bool
-     */
-    public function removeHeader($name) {
-
-        $this->inner->removeHeader($name);
-
-    }
-
-    /**
-     * Sets the HTTP version.
-     *
-     * Should be 1.0 or 1.1.
-     *
-     * @param string $version
-     * @return void
-     */
-    public function setHttpVersion($version) {
-
-        $this->inner->setHttpVersion($version);
-
-    }
-
-    /**
-     * Returns the HTTP version.
-     *
-     * @return string
-     */
-    public function getHttpVersion() {
-
-        return $this->inner->getHttpVersion();
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/MessageInterface.php Deleted

@@ -1,131 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * The MessageInterface is the base interface that's used by both
- * the RequestInterface and ResponseInterface.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface MessageInterface {
-
-    /**
-     * Returns the body as a readable stream resource.
-     *
-     * Note that the stream may not be rewindable, and therefore may only be
-     * read once.
-     *
-     * @return resource
-     */
-    function getBodyAsStream();
-
-    /**
-     * Returns the body as a string.
-     *
-     * Note that because the underlying data may be based on a stream, this
-     * method could only work correctly the first time.
-     *
-     * @return string
-     */
-    function getBodyAsString();
-
-    /**
-     * Returns the message body, as it's internal representation.
-     *
-     * This could be either a string or a stream.
-     *
-     * @return resource|string
-     */
-    function getBody();
-
-    /**
-     * Updates the body resource with a new stream.
-     *
-     * @param resource $body
-     * @return void
-     */
-    function setBody($body);
-
-    /**
-     * Returns all the HTTP headers as an array.
-     *
-     * @return array
-     */
-    function getHeaders();
-
-    /**
-     * Returns a specific HTTP header, based on it's name.
-     *
-     * The name must be treated as case-insensitive.
-     *
-     * If the header does not exist, this method must return null.
-     *
-     * @param string $name
-     * @return string|null
-     */
-    function getHeader($name);
-
-    /**
-     * Updates a HTTP header.
-     *
-     * The case-sensitity of the name value must be retained as-is.
-     *
-     * @param string $name
-     * @param string $value
-     * @return void
-     */
-    function setHeader($name, $value);
-
-    /**
-     * Resets HTTP headers
-     *
-     * This method overwrites all existing HTTP headers
-     *
-     * @param array $headers
-     * @return void
-     */
-    function setHeaders(array $headers);
-
-    /**
-     * Adds a new set of HTTP headers.
-     *
-     * Any header specified in the array that already exists will be
-     * overwritten, but any other existing headers will be retained.
-     *
-     * @param array $headers
-     * @return void
-     */
-    function addHeaders(array $headers);
-
-    /**
-     * Removes a HTTP header.
-     *
-     * The specified header name must be treated as case-insenstive.
-     * This method should return true if the header was successfully deleted,
-     * and false if the header did not exist.
-     *
-     * @return bool
-     */
-    function removeHeader($name);
-
-    /**
-     * Sets the HTTP version.
-     *
-     * Should be 1.0 or 1.1.
-     *
-     * @param string $version
-     * @return void
-     */
-    function setHttpVersion($version);
-
-    /**
-     * Returns the HTTP version.
-     *
-     * @return string
-     */
-    function getHttpVersion();
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Request.php Deleted

@@ -1,305 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-use InvalidArgumentException;
-
-/**
- * The Request class represents a single HTTP request.
- *
- * You can either simply construct the object from scratch, or if you need
- * access to the current HTTP request, use Sapi::getRequest.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Request extends Message implements RequestInterface {
-
-    /**
-     * HTTP Method
-     *
-     * @var string
-     */
-    protected $method;
-
-    /**
-     * Request Url
-     *
-     * @var string
-     */
-    protected $url;
-
-    /**
-     * Creates the request object
-     *
-     * @param string $method
-     * @param string $url
-     * @param array $headers
-     * @param resource $body
-     */
-    public function __construct($method = null, $url = null, array $headers = null, $body = null) {
-
-        if (is_array($method)) {
-            throw new InvalidArgumentException('The first argument for this constructor should be a string or null, not an array. Did you upgrade from sabre/http 1.0 to 2.0?');
-        }
-        if (!is_null($method))      $this->setMethod($method);
-        if (!is_null($url))         $this->setUrl($url);
-        if (!is_null($headers))     $this->setHeaders($headers);
-        if (!is_null($body))        $this->setBody($body);
-
-    }
-
-    /**
-     * Returns the current HTTP method
-     *
-     * @return string
-     */
-    public function getMethod() {
-
-        return $this->method;
-
-    }
-
-    /**
-     * Sets the HTTP method
-     *
-     * @param string $method
-     * @return void
-     */
-    public function setMethod($method) {
-
-        $this->method = $method;
-
-    }
-
-    /**
-     * Returns the request url.
-     *
-     * @return string
-     */
-    public function getUrl() {
-
-        return $this->url;
-
-    }
-
-    /**
-     * Sets the request url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setUrl($url) {
-
-        $this->url = $url;
-
-    }
-
-    /**
-     * Returns the list of query parameters.
-     *
-     * This is equivalent to PHP's $_GET superglobal.
-     *
-     * @return array
-     */
-    public function getQueryParameters() {
-
-        $url = $this->getUrl();
-        if (($index = strpos($url,'?'))===false) {
-            return [];
-        } else {
-            parse_str(substr($url, $index+1), $queryParams);
-            return $queryParams;
-        }
-
-    }
-
-    /**
-     * Sets the absolute url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setAbsoluteUrl($url) {
-
-        $this->absoluteUrl = $url;
-
-    }
-
-    /**
-     * Returns the absolute url.
-     *
-     * @return string
-     */
-    public function getAbsoluteUrl() {
-
-        return $this->absoluteUrl;
-
-    }
-
-    /**
-     * Base url
-     *
-     * @var string
-     */
-    protected $baseUrl = '/';
-
-    /**
-     * Sets a base url.
-     *
-     * This url is used for relative path calculations.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setBaseUrl($url) {
-
-        $this->baseUrl = $url;
-
-    }
-
-    /**
-     * Returns the current base url.
-     *
-     * @return string
-     */
-    public function getBaseUrl() {
-
-        return $this->baseUrl;
-
-    }
-
-    /**
-     * Returns the relative path.
-     *
-     * This is being calculated using the base url. This path will not start
-     * with a slash, so it will always return something like
-     * 'example/path.html'.
-     *
-     * If the full path is equal to the base url, this method will return an
-     * empty string.
-     *
-     * This method will also urldecode the path, and if the url was incoded as
-     * ISO-8859-1, it will convert it to UTF-8.
-     *
-     * If the path is outside of the base url, a LogicException will be thrown.
-     *
-     * @return string
-     */
-    public function getPath() {
-
-        // Removing duplicated slashes.
-        $uri = str_replace('//','/',$this->getUrl());
-
-        if (strpos($uri,$this->getBaseUrl())===0) {
-
-            // We're not interested in the query part (everything after the ?).
-            list($uri) = explode('?', $uri);
-            return trim(URLUtil::decodePath(substr($uri,strlen($this->getBaseUrl()))),'/');

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/RequestDecorator.php Deleted

@@ -1,231 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * Request Decorator
- *
- * This helper class allows you to easily create decorators for the Request
- * object.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH. All rights reserved.
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class RequestDecorator implements RequestInterface {
-
-    use MessageDecoratorTrait;
-
-    /**
-     * Constructor.
-     *
-     * @param RequestInterface $inner
-     */
-    public function __construct(RequestInterface $inner) {
-
-        $this->inner = $inner;
-
-    }
-
-    /**
-     * Returns the current HTTP method
-     *
-     * @return string
-     */
-    public function getMethod() {
-
-        return $this->inner->getMethod();
-
-    }
-
-    /**
-     * Sets the HTTP method
-     *
-     * @param string $method
-     * @return void
-     */
-    public function setMethod($method) {
-
-        $this->inner->setMethod($method);
-
-    }
-
-    /**
-     * Returns the request url.
-     *
-     * @return string
-     */
-    public function getUrl() {
-
-        return $this->inner->getUrl();
-
-    }
-
-    /**
-     * Sets the request url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setUrl($url) {
-
-        $this->inner->setUrl($url);
-
-    }
-
-    /**
-     * Returns the absolute url.
-     *
-     * @return string
-     */
-    public function getAbsoluteUrl() {
-
-        return $this->inner->getAbsoluteUrl();
-
-    }
-
-    /**
-     * Sets the absolute url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setAbsoluteUrl($url) {
-
-        $this->inner->setAbsoluteUrl($url);
-
-    }
-
-    /**
-     * Returns the current base url.
-     *
-     * @return string
-     */
-    public function getBaseUrl() {
-
-        return $this->inner->getBaseUrl();
-
-    }
-
-    /**
-     * Sets a base url.
-     *
-     * This url is used for relative path calculations.
-     *
-     * The base url should default to /
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setBaseUrl($url) {
-
-        $this->inner->setBaseUrl($url);
-
-    }
-
-    /**
-     * Returns the relative path.
-     *
-     * This is being calculated using the base url. This path will not start
-     * with a slash, so it will always return something like
-     * 'example/path.html'.
-     *
-     * If the full path is equal to the base url, this method will return an
-     * empty string.
-     *
-     * This method will also urldecode the path, and if the url was incoded as
-     * ISO-8859-1, it will convert it to UTF-8.
-     *
-     * If the path is outside of the base url, a LogicException will be thrown.
-     *
-     * @return string
-     */
-    public function getPath() {
-
-        return $this->inner->getPath();
-
-    }
-
-    /**
-     * Returns the list of query parameters.
-     *
-     * This is equivalent to PHP's $_GET superglobal.
-     *
-     * @return array
-     */
-    public function getQueryParameters() {
-
-        return $this->inner->getQueryParameters();
-
-    }
-
-    /**
-     * Returns the POST data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * @return array
-     */
-    public function getPostData() {
-
-        return $this->inner->getPostData();
-
-    }
-
-    /**
-     * Sets the post data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * This would not have been needed, if POST data was accessible as
-     * php://input, but unfortunately we need to special case it.
-     *
-     * @param array $postData
-     * @return void
-     */
-    public function setPostData(array $postData) {
-
-        $this->inner->setPostData($postData);
-
-    }
-
-
-    /**
-     * Returns an item from the _SERVER array.
-     *
-     * If the value does not exist in the array, null is returned.
-     *
-     * @param string $valueName
-     * @return string|null

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/RequestInterface.php Deleted

@@ -1,147 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * The RequestInterface represents a HTTP request.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface RequestInterface extends MessageInterface {
-
-    /**
-     * Returns the current HTTP method
-     *
-     * @return string
-     */
-    function getMethod();
-
-    /**
-     * Sets the HTTP method
-     *
-     * @param string $method
-     * @return void
-     */
-    function setMethod($method);
-
-    /**
-     * Returns the request url.
-     *
-     * @return string
-     */
-    function getUrl();
-
-    /**
-     * Sets the request url.
-     *
-     * @param string $url
-     * @return void
-     */
-    function setUrl($url);
-
-    /**
-     * Returns the absolute url.
-     *
-     * @return string
-     */
-    function getAbsoluteUrl();
-
-    /**
-     * Sets the absolute url.
-     *
-     * @param string $url
-     * @return void
-     */
-    function setAbsoluteUrl($url);
-
-    /**
-     * Returns the current base url.
-     *
-     * @return string
-     */
-    function getBaseUrl();
-
-    /**
-     * Sets a base url.
-     *
-     * This url is used for relative path calculations.
-     *
-     * The base url should default to /
-     *
-     * @param string $url
-     * @return void
-     */
-    function setBaseUrl($url);
-
-    /**
-     * Returns the relative path.
-     *
-     * This is being calculated using the base url. This path will not start
-     * with a slash, so it will always return something like
-     * 'example/path.html'.
-     *
-     * If the full path is equal to the base url, this method will return an
-     * empty string.
-     *
-     * This method will also urldecode the path, and if the url was incoded as
-     * ISO-8859-1, it will convert it to UTF-8.
-     *
-     * If the path is outside of the base url, a LogicException will be thrown.
-     *
-     * @return string
-     */
-    function getPath();
-
-    /**
-     * Returns the list of query parameters.
-     *
-     * This is equivalent to PHP's $_GET superglobal.
-     *
-     * @return array
-     */
-    function getQueryParameters();
-
-    /**
-     * Returns the POST data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * @return array
-     */
-    function getPostData();
-
-    /**
-     * Sets the post data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * This would not have been needed, if POST data was accessible as
-     * php://input, but unfortunately we need to special case it.
-     *
-     * @param array $postData
-     * @return void
-     */
-    function setPostData(array $postData);
-
-    /**
-     * Returns an item from the _SERVER array.
-     *
-     * If the value does not exist in the array, null is returned.
-     *
-     * @param string $valueName
-     * @return string|null
-     */
-    function getRawServerValue($valueName);
-
-    /**
-     * Sets the _SERVER array.
-     *
-     * @param array $data
-     * @return void
-     */
-    function setRawServerData(array $data);
-
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Response.php Deleted

@@ -1,191 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * This class represents a single HTTP response.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Response extends Message implements ResponseInterface {
-
-    /**
-     * This is the list of currently registered HTTP status codes.
-     *
-     * @var array
-     */
-    static public $statusCodes = [
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authorative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status', // RFC 4918
-        208 => 'Already Reported', // RFC 5842
-        226 => 'IM Used', // RFC 3229
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => 'Reserved',
-        307 => 'Temporary Redirect',
-        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',
-        418 => 'I\'m a teapot', // RFC 2324
-        422 => 'Unprocessable Entity', // RFC 4918
-        423 => 'Locked', // RFC 4918
-        424 => 'Failed Dependency', // RFC 4918
-        426 => 'Upgrade required',
-        428 => 'Precondition required', // RFC 6585
-        429 => 'Too Many Requests', // RFC 6585
-        431 => 'Request Header Fields Too Large', // RFC 6585
-        451 => 'Unavailable For Legal Reasons', // draft-tbray-http-legally-restricted-status
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version not supported',
-        506 => 'Variant Also Negotiates',
-        507 => 'Insufficient Storage', // RFC 4918
-        508 => 'Loop Detected', // RFC 5842
-        509 => 'Bandwidth Limit Exceeded', // non-standard
-        510 => 'Not extended',
-        511 => 'Network Authentication Required', // RFC 6585
-    ];
-
-    /**
-     * HTTP status code
-     *
-     * @var int
-     */
-    protected $status;
-
-    /**
-     * HTTP status text
-     *
-     * @var string
-     */
-    protected $statusText;
-
-    /**
-     * Creates the response object
-     *
-     * @param string|int $status
-     * @param array $headers
-     * @param resource $body
-     * @return void
-     */
-    public function __construct($status = null, array $headers = null, $body = null) {
-
-        if (!is_null($status)) $this->setStatus($status);
-        if (!is_null($headers)) $this->setHeaders($headers);
-        if (!is_null($body)) $this->setBody($body);
-
-    }
-
-
-    /**
-     * Returns the current HTTP status code.
-     *
-     * @return int
-     */
-    public function getStatus() {
-
-        return $this->status;
-
-    }
-
-    /**
-     * Returns the human-readable status string.
-     *
-     * In the case of a 200, this may for example be 'OK'.
-     *
-     * @return string
-     */
-    public function getStatusText() {
-
-        return $this->statusText;
-
-    }
-
-    /**
-     * Sets the HTTP status code.
-     *
-     * This can be either the full HTTP status code with human readable string,
-     * for example: "403 I can't let you do that, Dave".
-     *
-     * Or just the code, in which case the appropriate default message will be
-     * added.
-     *
-     * @param string|int $status
-     * @throws \InvalidArgumentExeption
-     * @return void
-     */
-    public function setStatus($status) {
-
-        if (ctype_digit($status) || is_int($status)) {
-
-            $statusCode = $status;
-            $statusText = isset(self::$statusCodes[$status])?self::$statusCodes[$status]:'Unknown';
-
-        } else {
-            list(
-                $statusCode,
-                $statusText
-            ) = explode(' ', $status, 2);
-        }
-        if ($statusCode < 100 || $statusCode > 999) {
-            throw new \InvalidArgumentException('The HTTP status code must be exactly 3 digits');
-        }
-
-        $this->status = $statusCode;
-        $this->statusText = $statusText;
-
-    }
-
-    /**
-     * Serializes the response object as a string.
-     *
-     * This is useful for debugging purposes.
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        $str = 'HTTP/' . $this->httpVersion . ' ' . $this->getStatus() . ' ' . $this->getStatusText() . "\r\n";
-        foreach($this->getHeaders() as $key=>$value) {
-            $str.= $key . ": " . $value . "\r\n";
-        }
-        $str.="\r\n";
-        $str.=$this->getBodyAsString();
-        return $str;
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/ResponseDecorator.php Deleted

@@ -1,84 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * Response Decorator
- *
- * This helper class allows you to easily create decorators for the Response
- * object.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH. All rights reserved.
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class ResponseDecorator implements ResponseInterface {
-
-    use MessageDecoratorTrait;
-
-    /**
-     * Constructor.
-     *
-     * @param ResponseInterface $inner
-     */
-    public function __construct(ResponseInterface $inner) {
-
-        $this->inner = $inner;
-
-    }
-
-    /**
-     * Returns the current HTTP status code.
-     *
-     * @return int
-     */
-    public function getStatus() {
-
-        return $this->inner->getStatus();
-
-    }
-
-
-    /**
-     * Returns the human-readable status string.
-     *
-     * In the case of a 200, this may for example be 'OK'.
-     *
-     * @return string
-     */
-    public function getStatusText() {
-
-        return $this->inner->getStatusText();
-
-    }
-    /**
-     * Sets the HTTP status code.
-     *
-     * This can be either the full HTTP status code with human readable string,
-     * for example: "403 I can't let you do that, Dave".
-     *
-     * Or just the code, in which case the appropriate default message will be
-     * added.
-     *
-     * @param string|int $status
-     * @return void
-     */
-    public function setStatus($status) {
-
-        $this->inner->setStatus($status);
-
-    }
-
-    /**
-     * Serializes the request object as a string.
-     *
-     * This is useful for debugging purposes.
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return $this->inner->__toString();
-
-    }
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/ResponseInterface.php Deleted

@@ -1,45 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * This interface represents a HTTP response.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface ResponseInterface extends MessageInterface {
-
-    /**
-     * Returns the current HTTP status code.
-     *
-     * @return int
-     */
-    function getStatus();
-
-    /**
-     * Returns the human-readable status string.
-     *
-     * In the case of a 200, this may for example be 'OK'.
-     *
-     * @return string
-     */
-    function getStatusText();
-
-    /**
-     * Sets the HTTP status code.
-     *
-     * This can be either the full HTTP status code with human readable string,
-     * for example: "403 I can't let you do that, Dave".
-     *
-     * Or just the code, in which case the appropriate default message will be
-     * added.
-     *
-     * @param string|int $status
-     * @throws \InvalidArgumentExeption
-     * @return void
-     */
-    function setStatus($status);
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Sapi.php Deleted

@@ -1,170 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * PHP SAPI
- *
- * This object is responsible for:
- * 1. Constructing a Request object based on the current HTTP request sent to
- *    the PHP process.
- * 2. Sending the Response object back to the client.
- *
- * It could be said that this class provides a mapping between the Request and
- * Response objects, and php's:
- *
- * * $_SERVER
- * * $_POST
- * * $_FILES
- * * php://input
- * * echo()
- * * header()
- * * php://output
- *
- * You can choose to either call all these methods statically, but you can also
- * instantiate this as an object to allow for polymorhpism.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Sapi {
-
-    /**
-     * This static method will create a new Request object, based on the
-     * current PHP request.
-     *
-     * @return Request
-     */
-    static function getRequest() {
-
-        $r = self::createFromServerArray($_SERVER);
-        $r->setBody(fopen('php://input','r'));
-        $r->setPostData($_POST);
-        return $r;
-
-    }
-
-    /**
-     * Sends the HTTP response back to a HTTP client.
-     *
-     * This calls php's header() function and streams the body to php://output.
-     *
-     * @param ResponseInterface $response
-     * @return void
-     */
-    static function sendResponse(ResponseInterface $response) {
-
-        header('HTTP/' . $response->getHttpVersion() . ' ' . $response->getStatus() . ' ' . $response->getStatusText());
-        foreach($response->getHeaders() as $key=>$value) {
-
-            header($key . ': ' . $value);
-
-        }
-        file_put_contents('php://output', $response->getBody());
-
-    }
-
-    /**
-     * This static method will create a new Request object, based on a PHP
-     * $_SERVER array.
-     *
-     * @param array $serverArray
-     * @return Request
-     */
-    static function createFromServerArray(array $serverArray) {
-
-        $headers = array();
-        $method = null;
-        $url = null;
-        $httpVersion = '1.1';
-
-        $protocol = 'http';
-        $hostName = 'localhost';
-
-        foreach($serverArray as $key=>$value) {
-
-            switch($key) {
-
-                case 'SERVER_PROTOCOL' :
-                    if ($value==='HTTP/1.0') {
-                        $httpVersion = '1.0';
-                    }
-                    break;
-                case 'REQUEST_METHOD' :
-                    $method = $value;
-                    break;
-                case 'REQUEST_URI' :
-                    $url = $value;
-                    break;
-
-                // These sometimes should up without a HTTP_ prefix
-                case 'CONTENT_TYPE' :
-                    $headers['Content-Type'] = $value;
-                    break;
-                case 'CONTENT_LENGTH' :
-                    $headers['Content-Length'] = $value;
-                    break;
-
-                // mod_php on apache will put credentials in these variables.
-                // (fast)cgi does not usually do this, however.
-                case 'PHP_AUTH_USER' :
-                    if (isset($serverArray['PHP_AUTH_PW'])) {
-                        $headers['Authorization'] = 'Basic ' . base64_encode($value . ':' . $serverArray['PHP_AUTH_PW']);
-                    }
-                    break;
-
-                // Similarly, mod_php may also screw around with digest auth.
-                case 'PHP_AUTH_DIGEST' :
-                    $headers['Authorization'] = 'Digest ' . $value;
-                    break;
-
-                // Apache may prefix the HTTP_AUTHORIZATION header with
-                // REDIRECT_, if mod_rewrite was used.
-                case 'REDIRECT_HTTP_AUTHORIZATION' :
-                    $headers['Authorization'] = $value;
-                    break;
-
-                case 'HTTP_HOST' :
-                    $hostName = $value;
-                    $headers['Host'] = $value;
-                    break;
-
-                case 'HTTPS' :
-                    if (!empty($value) && $value!=='off') {
-                        $protocol = 'https';
-                    }
-                    break;
-
-                default :
-                    if (substr($key,0,5)==='HTTP_') {
-                        // It's a HTTP header
-
-                        // Normalizing it to be prettier
-                        $header = strtolower(substr($key,5));
-
-                        // Transforming dashes into spaces, and uppercasing
-                        // every first letter.
-                        $header = ucwords(str_replace('_', ' ', $header));
-
-                        // Turning spaces into dashes.
-                        $header = str_replace(' ', '-', $header);
-                        $headers[$header] = $value;
-
-                    }
-                    break;
-
-
-            }
-
-        }
-
-        $r = new Request($method, $url, $headers);
-        $r->setHttpVersion($httpVersion);
-        $r->setRawServerData($serverArray);
-        $r->setAbsoluteUrl($protocol . '://' . $hostName . $url);
-        return $r;
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/URLUtil.php Deleted

@@ -1,121 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * URL utility class
- *
- * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
- *
- * It was not possible to use PHP's built-in methods for this, because some clients don't like
- * encoding of certain characters.
- *
- * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
- * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
- * kept as-is.
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class URLUtil {
-
-    /**
-     * Encodes the path of a url.
-     *
-     * slashes (/) are treated as path-separators.
-     *
-     * @param string $path
-     * @return string
-     */
-    static function encodePath($path) {
-
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\/:@])/',function($match) {
-
-            return '%'.sprintf('%02x',ord($match[0]));
-
-        }, $path);
-
-    }
-
-    /**
-     * Encodes a 1 segment of a path
-     *
-     * Slashes are considered part of the name, and are encoded as %2f
-     *
-     * @param string $pathSegment
-     * @return string
-     */
-    static function encodePathSegment($pathSegment) {
-
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~:@])/',function($match) {
-
-            return '%'.sprintf('%02x',ord($match[0]));
-
-        }, $pathSegment);
-    }
-
-    /**
-     * Decodes a url-encoded path
-     *
-     * @param string $path
-     * @return string
-     */
-    static function decodePath($path) {
-
-        return self::decodePathSegment($path);
-
-    }
-
-    /**
-     * Decodes a url-encoded path segment
-     *
-     * @param string $path
-     * @return string
-     */
-    static function decodePathSegment($path) {
-
-        $path = rawurldecode($path);
-        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
-
-        switch($encoding) {
-
-            case 'ISO-8859-1' :
-                $path = utf8_encode($path);
-
-        }
-
-        return $path;
-
-    }
-
-    /**
-     * Returns the 'dirname' and 'basename' for a path.
-     *
-     * The reason there is a custom function for this purpose, is because
-     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
-     * and we need a method that just operates on UTF-8 characters.
-     *
-     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
-     * directory separator on windows.
-     *
-     * This method returns the 2 components as an array.
-     *
-     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
-     * string is stripped off.
-     *
-     * @param string $path
-     * @return array
-     */
-    static function splitPath($path) {
-
-        $matches = array();
-        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
-            return array($matches[1],$matches[2]);
-        } else {
-            return array(null,null);
-        }
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Util.php Deleted

@@ -1,177 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * HTTP utility methods
- *
- * @copyright Copyright (C) 2009-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @author Paul Voegler
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Util {
-
-    /**
-     * Parses a RFC2616-compatible date string
-     *
-     * This method returns false if the date is invalid
-     *
-     * @param string $dateHeader
-     * @return bool|DateTime
-     */
-    static function parseHTTPDate($dateHeader) {
-
-        //RFC 2616 section 3.3.1 Full Date
-        //Only the format is checked, valid ranges are checked by strtotime below
-        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
-        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
-        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
-        $time = '[0-2]\d(\:[0-5]\d){2}';
-        $date3 = $month . ' ([1-3]\d| \d)';
-        $date2 = '[0-3]\d\-' . $month . '\-\d\d';
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $date1 = '[0-3]\d ' . $month . ' [1-9]\d{3}';
-
-        //ANSI C's asctime() format
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
-        //RFC 850, obsoleted by RFC 1036
-        $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
-        //RFC 822, updated by RFC 1123
-        $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
-        //allowed date formats by RFC 2616
-        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
-
-        //allow for space around the string and strip it
-        $dateHeader = trim($dateHeader, ' ');
-        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
-            return false;
-
-        //append implicit GMT timezone to ANSI C time format
-        if (strpos($dateHeader, ' GMT') === false)
-            $dateHeader .= ' GMT';
-
-
-        $realDate = strtotime($dateHeader);
-        //strtotime can return -1 or false in case of error
-        if ($realDate !== false && $realDate >= 0)
-            return new \DateTime('@' . $realDate, new \DateTimeZone('UTC'));
-
-    }
-
-    /**
-     * Transforms a DateTime object to HTTP's most common date format.
-     *
-     * We're serializing it as the RFC 1123 date, which, for HTTP must be
-     * specified as GMT.
-     *
-     * @param \DateTime $dateTime
-     * @return string
-     */
-    static function toHTTPDate(\DateTime $dateTime) {
-
-        // We need to clone it, as we don't want to affect the existing
-        // DateTime.
-        $dateTime = clone $dateTime;
-        $dateTime->setTimeZone(new \DateTimeZone('GMT'));
-        return $dateTime->format('D, d M Y H:i:s \G\M\T');
-
-    }
-
-    /**
-     * This method can be used to aid with content negotiation.
-     *
-     * It takes 2 arguments, the $acceptHeaderValue, which may come from Accept,
-     * Accept-Language, Accept-Charset, Accept-Encoding, and an array of items
-     * that the server can support.
-     *
-     * The result of this function will be the 'best possible option'. If no
-     * best possible option could be found, null is returned.
-     *
-     * When it's null you can according to the spec either return a default, or
-     * you can choose to emit 406 Not Acceptable.
-     *
-     * The method also accepts sending 'null' for the $acceptHeaderValue,
-     * implying that no accept header was sent.
-     *
-     * @param string|null $acceptHeader
-     * @param array $availableOptions
-     * @return string|null
-     */
-    static function negotiate($acceptHeaderValue, array $availableOptions) {
-
-        if (!$acceptHeaderValue) {
-            // Grabbing the first in the list.
-            return reset($availableOptions);
-        }
-
-        $proposals = explode(',' , $acceptHeaderValue);
-
-        /**
-         * This function loops through every element, and creates a new array
-         * with 3 elements per item:
-         * 1. mimeType
-         * 2. quality (contents of q= parameter)
-         * 3. index (the original order in the array)
-         */
-        array_walk(
-            $proposals,
-
-            function(&$value, $key) {
-
-                $parts = explode(';', $value);
-                $mimeType = trim($parts[0]);
-                if (isset($parts[1]) && substr(trim($parts[1]),0,2)==='q=') {
-                    $quality = substr(trim($parts[1]),2);
-                } else {
-                    $quality = 1;
-                }
-
-                $value = [$mimeType, $quality, $key];
-
-            }
-        );
-
-        /**
-         * This sorts the array based on quality first, and key-index second.
-         */
-        usort(
-            $proposals,
-
-            function($a, $b) {
-
-                // If quality is identical, we compare the original index.
-                if ($a[1]===$b[1]) {
-                    // Indexes are ints, so we can just subtract
-                    return $a[2] - $b[2];
-                } else {
-                    // Quality are floats, so we need to make sure we're
-                    // returning the correct integers.
-                    return $a[1] > $b[1]?-1:1;
-                }
-
-            }
-
-        );
-
-        // Now we're left with a correctly ordered Accept: header, so we can
-        // compare it to the available mimetypes.
-        foreach($proposals as $proposal) {
-
-            // If it's */* it means 'anything will wdo'
-            if ($proposal[0] === '*/*') {
-                return reset($availableOptions);
-            }
-
-            foreach($availableOptions as $availableItem) {
-                if ($availableItem===$proposal[0]) {
-                    return $availableItem;
-                }
-            }
-
-        }
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/lib/Sabre/HTTP/Version.php Deleted

sabre-http-2.0.4.tar.gz/tests/Sabre Deleted

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP Deleted

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP/Auth Deleted

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP/Auth/DigestTest.php Deleted

@@ -1,162 +0,0 @@
-<?php
-
-namespace Sabre\HTTP\Auth;
-
-use
-    Sabre\HTTP\Request,
-    Sabre\HTTP\Response;
-
-class DigestTest extends \PHPUnit_Framework_TestCase {
-
-    /**
-     * @var Sabre\HTTP\Response
-     */
-    private $response;
-
-    /**
-     * request
-     *
-     * @var Sabre\HTTP\Request
-     */
-    private $request;
-
-    /**
-     * @var Sabre\HTTP\Auth\Digest
-     */
-    private $auth;
-
-    const REALM = 'SabreDAV unittest';
-
-    public function setUp() {
-
-        $this->response = new Response();
-        $this->request = new Request();
-        $this->auth = new Digest(self::REALM, $this->request, $this->response);
-
-
-    }
-
-    public function testDigest() {
-
-        list($nonce,$opaque) = $this->getServerTokens();
-
-        $username = 'admin';
-        $password = 12345;
-        $nc = '00002';
-        $cnonce = uniqid();
-
-        $digestHash = md5(
-            md5($username . ':' . self::REALM . ':' . $password) . ':' .
-            $nonce . ':' .
-            $nc . ':' .
-            $cnonce . ':' .
-            'auth:' .
-            md5('GET' . ':' . '/')
-        );
-
-        $this->request->setMethod('GET');
-        $this->request->setHeader('Authorization','Digest username="'.$username.'", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth,nc='.$nc.',cnonce="' . $cnonce . '"');
-
-        $this->auth->init();
-
-        $this->assertEquals($username,$this->auth->getUserName());
-        $this->assertEquals(self::REALM,$this->auth->getRealm());
-        $this->assertTrue($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . $password)),'Authentication is deemed invalid through validateA1');
-        $this->assertTrue($this->auth->validatePassword($password),'Authentication is deemed invalid through validatePassword');
-
-    }
-
-    public function testInvalidDigest() {
-
-        list($nonce,$opaque) = $this->getServerTokens();
-
-        $username = 'admin';
-        $password = 12345;
-        $nc = '00002';
-        $cnonce = uniqid();
-
-        $digestHash = md5(
-            md5($username . ':' . self::REALM . ':' . $password) . ':' .
-            $nonce . ':' .
-            $nc . ':' .
-            $cnonce . ':' .
-            'auth:' .
-            md5('GET' . ':' . '/')
-        );
-
-        $this->request->setMethod('GET');
-        $this->request->setHeader('Authorization', 'Digest username="'.$username.'", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth,nc='.$nc.',cnonce="' . $cnonce . '"');
-
-        $this->auth->init();
-
-        $this->assertFalse($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . ($password . 'randomness'))),'Authentication is deemed invalid through validateA1');
-
-    }
-
-    public function testInvalidDigest2() {
-
-        $this->request->setMethod('GET');
-        $this->request->setHeader('Authorization','basic blablabla');
-
-        $this->auth->init();
-        $this->assertFalse($this->auth->validateA1(md5('user:realm:password')));
-
-    }
-
-
-    public function testDigestAuthInt() {
-
-        $this->auth->setQOP(Digest::QOP_AUTHINT | Digest::QOP_AUTH);
-        list($nonce,$opaque) = $this->getServerTokens(Digest::QOP_AUTHINT| Digest::QOP_AUTH);
-
-        $username = 'admin';
-        $password = 12345;
-        $nc = '00003';
-        $cnonce = uniqid();
-
-        $digestHash = md5(
-            md5($username . ':' . self::REALM . ':' . $password) . ':' .
-            $nonce . ':' .
-            $nc . ':' .
-            $cnonce . ':' .
-            'auth-int:' .
-            md5('POST' . ':' . '/' . ':' . md5('body'))
-        );
-
-        $this->request->setMethod('POST');
-        $this->request->setHeader('Authorization','Digest username="'.$username.'", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth-int,nc='.$nc.',cnonce="' . $cnonce . '"');
-        $this->request->setBody('body');
-
-        $this->auth->init();
-
-        $this->assertTrue($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . $password)),'Authentication is deemed invalid through validateA1');
-
-    }
-
-    private function getServerTokens($qop = Digest::QOP_AUTH) {
-
-        $this->auth->requireLogin();
-
-        switch($qop) {
-            case Digest::QOP_AUTH    : $qopstr='auth'; break;
-            case Digest::QOP_AUTHINT : $qopstr='auth-int'; break;
-            default                                 : $qopstr='auth,auth-int'; break;
-        }
-
-        $test = preg_match('/Digest realm="'.self::REALM.'",qop="'.$qopstr.'",nonce="([0-9a-f]*)",opaque="([0-9a-f]*)"/',
-            $this->response->getHeader('WWW-Authenticate'),$matches);
-
-        $this->assertTrue($test==true,'The WWW-Authenticate response didn\'t match our pattern. We received: ' . $this->response->getHeader('WWW-Authenticate'));
-
-        $nonce = $matches[1];
-        $opaque = $matches[2];
-
-        // Reset our environment
-        $this->setUp();
-        $this->auth->setQOP($qop);
-
-        return array($nonce,$opaque);
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP/ClientTest.php Deleted

@@ -1,406 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class ClientTest extends \PHPUnit_Framework_TestCase {
-
-    protected $client;
-
-    function testCreateCurlSettingsArrayGET() {
-
-        $client = new ClientMock();
-        $client->addCurlSetting(CURLOPT_POSTREDIR, 0);
-
-        $request = new Request('GET','http://example.org/', ['X-Foo' => 'bar']);
-
-        $this->assertEquals(
-            [
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_FOLLOWLOCATION => true,
-                CURLOPT_HEADER => true,
-                CURLOPT_MAXREDIRS => 5,
-                CURLOPT_POSTREDIR => 0,
-                CURLOPT_HTTPHEADER => ['X-Foo: bar'],
-                CURLOPT_URL => 'http://example.org/',
-                CURLOPT_CUSTOMREQUEST => 'GET',
-                CURLOPT_POSTFIELDS => null,
-                CURLOPT_PUT => false,
-            ],
-            $client->createCurlSettingsArray($request)
-        );
-
-    }
-
-    function testCreateCurlSettingsArrayHEAD() {
-
-        $client = new ClientMock();
-        $request = new Request('HEAD','http://example.org/', ['X-Foo' => 'bar']);
-
-        $this->assertEquals(
-            [
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_FOLLOWLOCATION => true,
-                CURLOPT_HEADER => true,
-                CURLOPT_MAXREDIRS => 5,
-                CURLOPT_POSTREDIR => 3,
-                CURLOPT_NOBODY => true,
-                CURLOPT_CUSTOMREQUEST => 'HEAD',
-                CURLOPT_HTTPHEADER => ['X-Foo: bar'],
-                CURLOPT_URL => 'http://example.org/',
-                CURLOPT_POSTFIELDS => null,
-                CURLOPT_PUT => false,
-            ],
-            $client->createCurlSettingsArray($request)
-        );
-
-    }
-
-    function testCreateCurlSettingsArrayPUTStream() {
-
-        $client = new ClientMock();
-
-        $h = fopen('php://memory', 'r+');
-        fwrite($h, 'booh');
-        $request = new Request('PUT','http://example.org/', ['X-Foo' => 'bar'], $h);
-
-        $this->assertEquals(
-            [
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_FOLLOWLOCATION => true,
-                CURLOPT_HEADER => true,
-                CURLOPT_MAXREDIRS => 5,
-                CURLOPT_POSTREDIR => 3,
-                CURLOPT_PUT => true,
-                CURLOPT_INFILE => $h,
-                CURLOPT_CUSTOMREQUEST => 'PUT',
-                CURLOPT_HTTPHEADER => ['X-Foo: bar'],
-                CURLOPT_URL => 'http://example.org/',
-            ],
-            $client->createCurlSettingsArray($request)
-        );
-
-    }
-
-    function testCreateCurlSettingsArrayPUTString() {
-
-        $client = new ClientMock();
-        $request = new Request('PUT','http://example.org/', ['X-Foo' => 'bar'], 'boo');
-
-        $this->assertEquals(
-            [
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_FOLLOWLOCATION => true,
-                CURLOPT_HEADER => true,
-                CURLOPT_MAXREDIRS => 5,
-                CURLOPT_POSTREDIR => 3,
-                CURLOPT_POSTFIELDS => 'boo',
-                CURLOPT_CUSTOMREQUEST => 'PUT',
-                CURLOPT_HTTPHEADER => ['X-Foo: bar'],
-                CURLOPT_URL => 'http://example.org/',
-            ],
-            $client->createCurlSettingsArray($request)
-        );
-
-    }
-
-    function testSend() {
-
-        $client = new ClientMock();
-        $request = new Request('GET', 'http://example.org/');
-
-        $client->on('doRequest', function($request, &$response) {
-            $response = new Response(200);
-        });
-
-        $response = $client->send($request);
-
-        $this->assertEquals(200, $response->getStatus());
-
-    }
-
-    function testSendClientError() {
-
-        $client = new ClientMock();
-        $request = new Request('GET', 'http://example.org/');
-
-        $client->on('doRequest', function($request, &$response) {
-            throw new ClientException('aaah',1);
-        });
-        $called = false;
-        $client->on('exception', function() use (&$called) {
-            $called = true;
-        });
-
-        try {
-            $client->send($request);
-            $this->fail('send() should have thrown an exception');
-        } catch (ClientException $e) {
-
-        }
-        $this->assertTrue($called);
-
-    }
-
-    function testSendHttpError() {
-
-        $client = new ClientMock();
-        $request = new Request('GET', 'http://example.org/');
-
-        $client->on('doRequest', function($request, &$response) {
-            $response = new Response(404);
-        });
-        $called = 0;
-        $client->on('error', function() use (&$called) {
-            $called++;
-        });
-        $client->on('error:404', function() use (&$called) {
-            $called++;
-        });
-
-        $client->send($request);
-        $this->assertEquals(2,$called);
-
-    }
-
-    function testSendRetry() {
-
-        $client = new ClientMock();
-        $request = new Request('GET', 'http://example.org/');
-
-        $called = 0;
-        $client->on('doRequest', function($request, &$response) use (&$called) {
-            $called++;
-            if ($called < 3) {
-                $response = new Response(404);
-            } else {
-                $response = new Response(200);
-            }
-        });
-
-        $errorCalled = 0;
-        $client->on('error', function($request, $response, &$retry, $retryCount) use (&$errorCalled) {
-
-            $errorCalled++;
-            $retry = true;
-
-        });
-
-        $response = $client->send($request);
-        $this->assertEquals(3,$called);
-        $this->assertEquals(2,$errorCalled);
-        $this->assertEquals(200, $response->getStatus());
-
-    }
-
-    function testHttpErrorException() {
-
-        $client = new ClientMock();
-        $client->setThrowExceptions(true);
-        $request = new Request('GET', 'http://example.org/');

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP/MessageDecoratorTest.php Deleted

@@ -1,75 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class MessageDecoratorTest extends \PHPUnit_Framework_TestCase {
-
-    protected $inner;
-    protected $outer;
-
-    function setUp() {
-
-        $this->inner = new Request();
-        $this->outer = new RequestDecorator($this->inner);
-
-    }
-
-    function testBody() {
-
-        $this->outer->setBody('foo');
-        $this->assertEquals('foo', stream_get_contents($this->inner->getBodyAsStream()));
-        $this->assertEquals('foo', stream_get_contents($this->outer->getBodyAsStream()));
-        $this->assertEquals('foo', $this->inner->getBodyAsString());
-        $this->assertEquals('foo', $this->outer->getBodyAsString());
-        $this->assertEquals('foo', $this->inner->getBody());
-        $this->assertEquals('foo', $this->outer->getBody());
-
-    }
-
-    function testHeaders() {
-
-        $this->outer->setHeaders([
-            'a' => 'b',
-            ]);
-
-        $this->assertEquals(['a' => 'b'], $this->inner->getHeaders());
-        $this->assertEquals(['a' => 'b'], $this->outer->getHeaders());
-
-        $this->outer->setHeaders([
-            'c' => 'd',
-            ]);
-
-        $this->assertEquals(['c' => 'd'], $this->inner->getHeaders());
-        $this->assertEquals(['c' => 'd'], $this->outer->getHeaders());
-
-        $this->outer->addHeaders([
-            'e' => 'f',
-            ]);
-
-        $this->assertEquals(['c' => 'd', 'e' => 'f'], $this->inner->getHeaders());
-        $this->assertEquals(['c' => 'd', 'e' => 'f'], $this->outer->getHeaders());
-    }
-
-    function testHeader() {
-
-        $this->outer->setHeader('a', 'c');
-
-        $this->assertEquals('c', $this->inner->getHeader('A'));
-        $this->assertEquals('c', $this->outer->getHeader('A'));
-
-        $this->outer->removeHeader('a');
-
-        $this->assertNull($this->inner->getHeader('A'));
-        $this->assertNull($this->outer->getHeader('A'));
-    }
-
-    function testHttpVersion() {
-
-        $this->outer->setHttpVersion('1.0');
-
-        $this->assertEquals('1.0', $this->inner->getHttpVersion());
-        $this->assertEquals('1.0', $this->outer->getHttpVersion());
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP/MessageTest.php Deleted

@@ -1,131 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class MessageTest extends \PHPUnit_Framework_TestCase {
-
-    function testConstruct() {
-
-        $message = new MessageMock();
-        $this->assertInstanceOf('Sabre\HTTP\Message', $message);
-
-    }
-
-    function testStreamBody() {
-
-        $body = 'foo';
-        $h = fopen('php://memory', 'r+');
-        fwrite($h, $body);
-        rewind($h);
-
-        $message = new MessageMock();
-        $message->setBody($h);
-
-        $this->assertEquals($body, $message->getBodyAsString());
-        rewind($h);
-        $this->assertEquals($body, stream_get_contents($message->getBodyAsStream()));
-        rewind($h);
-        $this->assertEquals($body, stream_get_contents($message->getBody()));
-
-    }
-
-    function testStringBody() {
-
-        $body = 'foo';
-
-        $message = new MessageMock();
-        $message->setBody($body);
-
-        $this->assertEquals($body, $message->getBodyAsString());
-        $this->assertEquals($body, stream_get_contents($message->getBodyAsStream()));
-        $this->assertEquals($body, $message->getBody());
-
-    }
-
-
-    function testGetEmptyBodyStream() {
-
-        $message = new MessageMock();
-        $body = $message->getBodyAsStream();
-
-        $this->assertEquals('', stream_get_contents($body));
-
-    }
-
-    function testGetEmptyBodyString() {
-
-        $message = new MessageMock();
-        $body = $message->getBodyAsString();
-
-        $this->assertEquals('', $body);
-
-    }
-
-    function testHeaders() {
-
-        $message = new MessageMock();
-        $message->setHeader('X-Foo', 'bar');
-
-        // Testing caselessness
-        $this->assertEquals('bar', $message->getHeader('X-Foo'));
-        $this->assertEquals('bar', $message->getHeader('x-fOO'));
-
-        $this->assertTrue(
-            $message->removeHeader('X-FOO')
-        );
-        $this->assertNull($message->getHeader('X-Foo'));
-        $this->assertFalse(
-            $message->removeHeader('X-FOO')
-        );
-
-    }
-
-    function testSendBody() {
-
-        $message = new MessageMock();
-
-        // String
-        $message->setBody('foo');
-
-        // Stream
-        $h = fopen('php://memory','r+');
-        fwrite($h,'bar');
-        rewind($h);
-        $message->setBody($h);
-
-        $body = $message->getBody();
-        rewind($body);
-
-        $this->assertEquals('bar', stream_get_contents($body));
-
-    }
-
-    function testSetHeaders() {
-
-        $message = new MessageMock();
-        $message->setHeaders([
-            'a' => 'b',
-        ]);
-        $message->setHeaders([
-            'c' => 'd',
-            ]);
-        $this->assertNull($message->getHeader('a'));
-
-    }
-
-    function testAddHeaders() {
-
-        $message = new MessageMock();
-        $message->addHeaders([
-            'a' => 'b',
-        ]);
-        $message->addHeaders([
-            'c' => 'd',
-        ]);
-        $this->assertEquals('b', $message->getHeader('a'));
-
-    }
-
-}
-
-class MessageMock extends Message { }

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP/RequestTest.php Deleted

@@ -1,151 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class RequestTest extends \PHPUnit_Framework_TestCase {
-
-    function testConstruct() {
-
-        $request = new Request('GET', '/foo', array(
-            'User-Agent' => 'Evert',
-        ));
-        $this->assertEquals('GET', $request->getMethod());
-        $this->assertEquals('/foo', $request->getUrl());
-        $this->assertEquals(array(
-            'User-Agent' => 'Evert',
-        ), $request->getHeaders());
-
-    }
-
-    function testGetQueryParameters() {
-
-        $request = new Request('GET', '/foo?a=b&c&d=e');
-        $this->assertEquals([
-            'a' => 'b',
-            'c' => null,
-            'd' => 'e',
-        ], $request->getQueryParameters());
-
-    }
-
-    function testGetQueryParametersNoData() {
-
-        $request = new Request('GET', '/foo');
-        $this->assertEquals([], $request->getQueryParameters());
-
-    }
-
-    /**
-     * @backupGlobals
-     */
-    function testCreateFromPHPRequest() {
-
-        $_SERVER['REQUEST_METHOD'] = 'PUT';
-
-        $request = Sapi::getRequest();
-        $this->assertEquals('PUT', $request->getMethod());
-
-    }
-
-    function testGetAbsoluteUrl() {
-
-        $s = [
-            'HTTP_HOST' => 'sabredav.org',
-            'REQUEST_URI' => '/foo'
-        ];
-
-        $r = Sapi::createFromServerArray($s);
-
-        $this->assertEquals('http://sabredav.org/foo', $r->getAbsoluteUrl());
-
-        $s = [
-            'HTTP_HOST'   => 'sabredav.org',
-            'REQUEST_URI' => '/foo',
-            'HTTPS'       => 'on',
-        ];
-
-        $r = Sapi::createFromServerArray($s);
-
-        $this->assertEquals('https://sabredav.org/foo', $r->getAbsoluteUrl());
-
-    }
-
-    function testGetPostData() {
-
-        $post = [
-            'bla' => 'foo',
-        ];
-        $r = new Request();
-        $r->setPostData($post);
-        $this->assertEquals($post, $r->getPostData());
-
-    }
-
-    function testGetPath() {
-
-        $request = new Request();
-        $request->setBaseUrl('/foo');
-        $request->setUrl('/foo/bar/');
-
-        $this->assertEquals('bar', $request->getPath());
-
-    }
-
-    function testGetPathStrippedQuery() {
-
-        $request = new Request();
-        $request->setBaseUrl('/foo');
-        $request->setUrl('/foo/bar/?a=b');
-
-        $this->assertEquals('bar', $request->getPath());
-
-    }
-
-    function testGetPathMissingSlash() {
-
-        $request = new Request();
-        $request->setBaseUrl('/foo/');
-        $request->setUrl('/foo');
-
-        $this->assertEquals('', $request->getPath());
-
-    }
-
-    /**
-     * @expectedException \LogicException
-     */
-    function testGetPathOutsideBaseUrl() {
-
-        $request = new Request();
-        $request->setBaseUrl('/foo/');
-        $request->setUrl('/bar/');
-
-        $request->getPath();
-
-    }
-
-    function testToString() {
-
-        $request = new Request('PUT', '/foo/bar', ['Content-Type' => 'text/xml']);
-        $request->setBody('foo');
-
-        $expected = <<<HI
-PUT /foo/bar HTTP/1.1\r
-Content-Type: text/xml\r
-\r
-foo
-HI;
-        $this->assertEquals($expected, (string)$request);
-
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    function testConstructorWithArray() {
-
-        $request = new Request(array());
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP/SapiTest.php Deleted

@@ -1,117 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class SapiTest extends \PHPUnit_Framework_TestCase {
-
-    function testConstructFromServerArray() {
-
-        $request = Sapi::createFromServerArray(array(
-            'REQUEST_URI'     => '/foo',
-            'REQUEST_METHOD'  => 'GET',
-            'HTTP_USER_AGENT' => 'Evert',
-            'CONTENT_TYPE'    => 'text/xml',
-            'CONTENT_LENGTH'  => '400',
-            'SERVER_PROTOCOL' => 'HTTP/1.0',
-        ));
-
-        $this->assertEquals('GET', $request->getMethod());
-        $this->assertEquals('/foo', $request->getUrl());
-        $this->assertEquals(array(
-            'User-Agent' => 'Evert',
-            'Content-Type' => 'text/xml',
-            'Content-Length' => '400',
-        ), $request->getHeaders());
-
-        $this->assertEquals('1.0', $request->getHttpVersion());
-
-        $this->assertEquals('400', $request->getRawServerValue('CONTENT_LENGTH'));
-        $this->assertNull($request->getRawServerValue('FOO'));
-
-    }
-
-    function testConstructPHPAuth() {
-
-        $request = Sapi::createFromServerArray(array(
-            'REQUEST_URI'     => '/foo',
-            'REQUEST_METHOD'  => 'GET',
-            'PHP_AUTH_USER'   => 'user',
-            'PHP_AUTH_PW'     => 'pass',
-        ));
-
-        $this->assertEquals('GET', $request->getMethod());
-        $this->assertEquals('/foo', $request->getUrl());
-        $this->assertEquals(array(
-            'Authorization' => 'Basic ' . base64_encode('user:pass'),
-        ), $request->getHeaders());
-
-    }
-
-    function testConstructPHPAuthDigest() {
-
-        $request = Sapi::createFromServerArray(array(
-            'REQUEST_URI'     => '/foo',
-            'REQUEST_METHOD'  => 'GET',
-            'PHP_AUTH_DIGEST' => 'blabla',
-        ));
-
-        $this->assertEquals('GET', $request->getMethod());
-        $this->assertEquals('/foo', $request->getUrl());
-        $this->assertEquals(array(
-            'Authorization' => 'Digest blabla',
-        ), $request->getHeaders());
-
-    }
-
-    function testConstructRedirectAuth() {
-
-        $request = Sapi::createFromServerArray(array(
-            'REQUEST_URI'                 => '/foo',
-            'REQUEST_METHOD'              => 'GET',
-            'REDIRECT_HTTP_AUTHORIZATION' => 'Basic bla',
-        ));
-
-        $this->assertEquals('GET', $request->getMethod());
-        $this->assertEquals('/foo', $request->getUrl());
-        $this->assertEquals(array(
-            'Authorization' => 'Basic bla',
-        ), $request->getHeaders());
-
-    }
-
-    /**
-     * @runInSeparateProcess
-     *
-     * Unfortunately we have no way of testing if the HTTP response code got
-     * changed.
-     */
-    function testSend() {
-
-        if (!function_exists('xdebug_get_headers')) {
-            $this->markTestSkipped('XDebug needs to be installed for this test to run');
-        }
-
-        $response = new Response(204, ['Content-Type', 'text/xml']);
-        $response->setBody('foo');
-
-        ob_start();
-
-        Sapi::sendResponse($response);
-        $headers = xdebug_get_headers();
-
-        $result = ob_get_clean();
-        header_remove();
-
-        $this->assertEquals(
-            [
-                "0: Content-Type",
-                "1: text/xml",
-            ],
-            $headers
-        );
-
-        $this->assertEquals('foo', $result);
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP/URLUtilTest.php Deleted

@@ -1,131 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class URLUtilTest extends \PHPUnit_Framework_TestCase{
-
-    function testEncodePath() {
-
-        $str = '';
-        for($i=0;$i<128;$i++) $str.=chr($i);
-
-        $newStr = URLUtil::encodePath($str);
-
-        $this->assertEquals(
-            '%00%01%02%03%04%05%06%07%08%09%0a%0b%0c%0d%0e%0f'.
-            '%10%11%12%13%14%15%16%17%18%19%1a%1b%1c%1d%1e%1f'.
-            '%20%21%22%23%24%25%26%27()%2a%2b%2c-./'.
-            '0123456789:%3b%3c%3d%3e%3f'.
-            '@ABCDEFGHIJKLMNO' .
-            'PQRSTUVWXYZ%5b%5c%5d%5e_' .
-            '%60abcdefghijklmno' .
-            'pqrstuvwxyz%7b%7c%7d~%7f',
-            $newStr);
-
-        $this->assertEquals($str,URLUtil::decodePath($newStr));
-
-    }
-
-    function testEncodePathSegment() {
-
-        $str = '';
-        for($i=0;$i<128;$i++) $str.=chr($i);
-
-        $newStr = URLUtil::encodePathSegment($str);
-
-        // Note: almost exactly the same as the last test, with the
-        // exception of the encoding of / (ascii code 2f)
-        $this->assertEquals(
-            '%00%01%02%03%04%05%06%07%08%09%0a%0b%0c%0d%0e%0f'.
-            '%10%11%12%13%14%15%16%17%18%19%1a%1b%1c%1d%1e%1f'.
-            '%20%21%22%23%24%25%26%27()%2a%2b%2c-.%2f'.
-            '0123456789:%3b%3c%3d%3e%3f'.
-            '@ABCDEFGHIJKLMNO' .
-            'PQRSTUVWXYZ%5b%5c%5d%5e_' .
-            '%60abcdefghijklmno' .
-            'pqrstuvwxyz%7b%7c%7d~%7f',
-            $newStr);
-
-        $this->assertEquals($str,URLUtil::decodePathSegment($newStr));
-
-    }
-
-    function testDecode() {
-
-        $str = 'Hello%20Test+Test2.txt';
-        $newStr = URLUtil::decodePath($str);
-        $this->assertEquals('Hello Test+Test2.txt',$newStr);
-
-    }
-
-    /**
-     * @depends testDecode
-     */
-    function testDecodeUmlaut() {
-
-        $str = 'Hello%C3%BC.txt';
-        $newStr = URLUtil::decodePath($str);
-        $this->assertEquals("Hello\xC3\xBC.txt",$newStr);
-
-    }
-
-    /**
-     * @depends testDecodeUmlaut
-     */
-    function testDecodeUmlautLatin1() {
-
-        $str = 'Hello%FC.txt';
-        $newStr = URLUtil::decodePath($str);
-        $this->assertEquals("Hello\xC3\xBC.txt",$newStr);
-
-    }
-
-    /**
-     * This testcase was sent by a bug reporter
-     *
-     * @depends testDecode
-     */
-    function testDecodeAccentsWindows7() {
-
-        $str = '/webdav/%C3%A0fo%C3%B3';
-        $newStr = URLUtil::decodePath($str);
-        $this->assertEquals(strtolower($str),URLUtil::encodePath($newStr));
-
-    }
-
-    function testSplitPath() {
-
-        $strings = array(
-
-            // input                    // expected result
-            '/foo/bar'                 => array('/foo','bar'),
-            '/foo/bar/'                => array('/foo','bar'),
-            'foo/bar/'                 => array('foo','bar'),
-            'foo/bar'                  => array('foo','bar'),
-            'foo/bar/baz'              => array('foo/bar','baz'),
-            'foo/bar/baz/'             => array('foo/bar','baz'),
-            'foo'                      => array('','foo'),
-            'foo/'                     => array('','foo'),
-            '/foo/'                    => array('','foo'),
-            '/foo'                     => array('','foo'),
-            ''                         => array(null,null),
-
-            // UTF-8
-            "/\xC3\xA0fo\xC3\xB3/bar"  => array("/\xC3\xA0fo\xC3\xB3",'bar'),
-            "/\xC3\xA0foo/b\xC3\xBCr/" => array("/\xC3\xA0foo","b\xC3\xBCr"),
-            "foo/\xC3\xA0\xC3\xBCr"    => array("foo","\xC3\xA0\xC3\xBCr"),
-
-        );
-
-        foreach($strings as $input => $expected) {
-
-            $output = URLUtil::splitPath($input);
-            $this->assertEquals($expected, $output, 'The expected output for \'' . $input . '\' was incorrect');
-
-
-        }
-
-
-    }
-
-}

sabre-http-2.0.4.tar.gz/tests/Sabre/HTTP/UtilTest.php Deleted

@@ -1,138 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class UtilTest extends \PHPUnit_Framework_TestCase {
-
-    function testParseHTTPDate() {
-
-        $times = array(
-            'Wed, 13 Oct 2010 10:26:00 GMT',
-            'Wednesday, 13-Oct-10 10:26:00 GMT',
-            'Wed Oct 13 10:26:00 2010',
-        );
-
-        $expected = 1286965560;
-
-        foreach($times as $time) {
-            $result = Util::parseHTTPDate($time);
-            $this->assertEquals($expected, $result->format('U'));
-        }
-
-        $result = Util::parseHTTPDate('Wed Oct  6 10:26:00 2010');
-        $this->assertEquals(1286360760, $result->format('U'));
-
-    }
-
-    function testParseHTTPDateFail() {
-
-        $times = array(
-            //random string
-            'NOW',
-            // not-GMT timezone
-            'Wednesday, 13-Oct-10 10:26:00 UTC',
-            // No space before the 6
-            'Wed Oct 6 10:26:00 2010',
-        );
-
-        foreach($times as $time) {
-            $this->assertFalse(Util::parseHTTPDate($time), 'We used the string: ' . $time);
-        }
-
-    }
-
-    function testTimezones() {
-
-        $default = date_default_timezone_get();
-        date_default_timezone_set('Europe/Amsterdam');
-
-        $this->testParseHTTPDate();
-
-        date_default_timezone_set($default);
-
-    }
-
-    function testToHTTPDate() {
-
-        $dt = new \DateTime('2011-12-10 12:00:00 +0200');
-
-        $this->assertEquals(
-            'Sat, 10 Dec 2011 10:00:00 GMT',
-            Util::toHTTPDate($dt)
-        );
-
-    }
-
-    function testStrtotimeFail() {
-
-        // Strtotime may return -1 when the date cannot be parsed.
-        // We are simulating this situation by testing a date that actually
-        // results in -1. (because I have found no other way to break this
-        // code)
-
-        $time = 'Wed, 13 Oct 1960 10:26:00 GMT';
-
-        $this->assertNull(Util::parseHTTPDate($time));
-
-    }
-
-    /**
-     * @dataProvider negotiateData
-     */
-    function testNegotiate($acceptHeader, $available, $expected) {
-
-        $this->assertEquals(
-            $expected,
-            Util::negotiate($acceptHeader, $available)
-        );
-
-    }
-
-    function negotiateData() {
-
-        return [
-            [ // simple
-                'application/xml',
-                ['application/xml'],
-                'application/xml',
-            ],
-            [ // no header
-                null,
-                ['application/xml'],
-                'application/xml',
-            ],
-            [ // 2 options
-                'application/json',
-                ['application/xml', 'application/json'],
-                'application/json',
-            ],
-            [ // 2 choices
-                'application/json, application/xml',
-                ['application/xml'],
-                'application/xml',
-            ],
-            [ // quality
-                'application/xml;q=0.2, application/json',
-                ['application/xml', 'application/json'],
-                'application/json',
-            ],
-            [ // wildcard
-                'image/jpeg, image/png, */*',
-                ['application/xml', 'application/json'],
-                'application/xml',
-            ],
-            [ // wildcard + quality
-                'image/jpeg, image/png; q=0.5, */*',
-                ['application/xml', 'application/json', 'image/png'],
-                'application/xml',
-            ],
-            [ // no match
-                'image/jpeg',
-                ['application/xml'],
-                null,
-            ],
-
-        ];
-
-    }
-}

sabre-http-2.0.4.tar.gz/.gitignore -> sabre-http-3.0.5.tar.gz/.gitignore Changed

sabre-http-2.0.4.tar.gz/.travis.yml -> sabre-http-3.0.5.tar.gz/.travis.yml Changed

sabre-http-3.0.5.tar.gz/ChangeLog.md Added

@@ -0,0 +1,191 @@
+ChangeLog
+=========
+
+3.0.5 (2015-05-11)
+------------------
+
+* #47: When re-using the client and doing any request after a `HEAD` request,
+  the client discards the body.
+
+
+3.0.4 (2014-12-10)
+------------------
+
+* #38: The Authentication helpers no longer overwrite any existing
+  `WWW-Authenticate` headers, but instead append new headers. This ensures
+  that multiple authentication systems can exist in the same environment.
+
+
+3.0.3 (2014-12-03)
+------------------
+
+* Hiding `Authorization` header value from `Request::__toString`.
+
+
+3.0.2 (2014-10-09)
+------------------
+
+* When parsing `Accept:` headers, we're ignoring invalid parts. Before we
+  would throw a PHP E_NOTICE.
+
+
+3.0.1 (2014-09-29)
+------------------
+
+* Minor change in unittests.
+
+
+3.0.0 (2014-09-23)
+------------------
+
+* `getHeaders()` now returns header values as an array, just like psr/http.
+* Added `hasHeader()`.
+
+
+2.1.0-alpha1 (2014-09-15)
+-------------------------
+
+* Changed: Copied most of the header-semantics for the PSR draft for
+  representing HTTP messages. [Reference here][psr-http].
+* This means that `setHeaders()` does not wipe out every existing header
+  anymore.
+* We also support multiple headers with the same name.
+* Use `Request::getHeaderAsArray()` and `Response::getHeaderAsArray()` to
+  get a hold off multiple headers with the same name.
+* If you use `getHeader()`, and there's more than 1 header with that name, we
+  concatenate all these with a comma.
+* `addHeader()` will now preserve an existing header with that name, and add a
+  second header with the same name.
+* The message class should be a lot faster now for looking up headers. No more
+  array traversal, because we maintain a tiny index.
+* Added: `URLUtil::resolve()` to make resolving relative urls super easy.
+* Switched to PSR-4.
+* #12: Circumventing CURL's FOLLOW_LOCATION and doing it in PHP instead. This
+  fixes compatibility issues with people that have open_basedir turned on.
+* Added: Content negotiation now correctly support mime-type parameters such as
+  charset.
+* Changed: `Util::negotiate()` is now deprecated. Use
+  `Util::negotiateContentType()` instead.
+* #14: The client now only follows http and https urls.
+
+
+2.0.4 (2014-07-14)
+------------------
+
+* Changed: No longer escaping @ in urls when it's not needed.
+* Fixed: #7: Client now correctly deals with responses without a body.
+
+
+2.0.3 (2014-04-17)
+------------------
+
+* Now works on hhvm!
+* Fixed: Now throwing an error when a Request object is being created with
+  arguments that were valid for sabre/http 1.0. Hopefully this will aid with
+  debugging for upgraders.
+
+
+2.0.2 (2014-02-09)
+------------------
+
+* Fixed: Potential security problem in the client.
+
+
+2.0.1 (2014-01-09)
+------------------
+
+* Fixed: getBodyAsString on an empty body now works.
+* Fixed: Version string
+
+
+2.0.0 (2014-01-08)
+------------------
+
+* Removed: Request::createFromPHPRequest. This is now handled by
+  Sapi::getRequest.
+
+
+2.0.0alpha6 (2014-01-03)
+------------------------
+
+* Added: Asynchronous HTTP client. See examples/asyncclient.php.
+* Fixed: Issue #4: Don't escape colon (:) when it's not needed.
+* Fixed: Fixed a bug in the content negotation script.
+* Fixed: Fallback for when CURLOPT_POSTREDIR is not defined (mainly for hhvm).
+* Added: The Request and Response object now have a `__toString()` method that
+  serializes the objects into a standard HTTP message. This is mainly for
+  debugging purposes.
+* Changed: Added Response::getStatusText(). This method returns the
+  human-readable HTTP status message. This part has been removed from
+  Response::getStatus(), which now always returns just the status code as an
+  int.
+* Changed: Response::send() is now Sapi::sendResponse($response).
+* Changed: Request::createFromPHPRequest is now Sapi::getRequest().
+* Changed: Message::getBodyAsStream and Message::getBodyAsString were added. The
+  existing Message::getBody changed it's behavior, so be careful.
+
+
+2.0.0alpha5 (2013-11-07)
+------------------------
+
+* Added: HTTP Status 451 Unavailable For Legal Reasons. Fight government
+  censorship!
+* Added: Ability to catch and retry http requests in the client when a curl
+  error occurs.
+* Changed: Request::getPath does not return the query part of the url, so
+  everything after the ? is stripped.
+* Added: a reverse proxy example.
+
+
+2.0.0alpha4 (2013-08-07)
+------------------------
+
+* Fixed: Doing a GET request with the client uses the last used HTTP method
+  instead.
+* Added: HttpException
+* Added: The Client class can now automatically emit exceptions when HTTP errors
+  occurred.
+
+
+2.0.0alpha3 (2013-07-24)
+------------------------
+
+* Changed: Now depends on sabre/event package.
+* Changed: setHeaders() now overwrites any existing http headers.
+* Added: getQueryParameters to RequestInterface.
+* Added: Util::negotiate.
+* Added: RequestDecorator, ResponseDecorator.
+* Added: A very simple HTTP client.
+* Added: addHeaders() to append a list of new headers.
+* Fixed: Not erroring on unknown HTTP status codes.
+* Fixed: Throwing exceptions on invalid HTTP status codes (not 3 digits).
+* Fixed: Much better README.md
+* Changed: getBody() now uses a bitfield to specify what type to return.
+
+
+2.0.0alpha2 (2013-07-02)
+------------------------
+
+* Added: Digest & AWS Authentication.
+* Added: Message::getHttpVersion and Message::setHttpVersion.
+* Added: Request::setRawServerArray, getRawServerValue.
+* Added: Request::createFromPHPRequest
+* Added: Response::send
+* Added: Request::getQueryParameters
+* Added: Utility for dealing with HTTP dates.
+* Added: Request::setPostData and Request::getPostData.
+* Added: Request::setAbsoluteUrl and Request::getAbsoluteUrl.
+* Added: URLUtil, methods for calculation relative and base urls.
+* Removed: Response::sendBody
+
+
+2.0.0alpha1 (2012-10-07)
+------------------------
+
+* Fixed: Lots of small naming improvements
+* Added: Introduction of Message, MessageInterface, Response, ResponseInterface.
+
+Before 2.0.0, this package was built-into SabreDAV, where it first appeared in
+January 2009.
+
+[psr-http]: https://github.com/php-fig/fig-standards/blob/master/proposed/http-message.md

sabre-http-2.0.4.tar.gz/LICENSE -> sabre-http-3.0.5.tar.gz/LICENSE Changed

sabre-http-2.0.4.tar.gz/README.md -> sabre-http-3.0.5.tar.gz/README.md Changed

@@ -12,15 +12,15 @@
 
 For Input:
 
-* `$_GET`
-* `$_POST`
-* `$_SERVER`
+* `$_GET`,
+* `$_POST`,
+* `$_SERVER`,
 * `php://input` or `$HTTP_RAW_POST_DATA`.
 
 For output:
 
-* `php://output` or `echo`.
-* `header()`
+* `php://output` or `echo`,
+* `header()`.
 
 What this library provides, is a `Request` object, and a `Response` object.
 
@@ -39,11 +39,10 @@
 Make sure you have [composer][1] installed. In your project directory, create,
 or edit a `composer.json` file, and make sure it contains something like this:
 
-
 ```json
 {
     "require" : {
-        "sabre/http" : "~2.0.0"
+        "sabre/http" : "~3.0.0"
     }
 }
 ```
@@ -53,18 +52,18 @@
 Quick history
 -------------
 
-This library came to existence in 2009, as a part of the [SabreDAV][2]
+This library came to existence in 2009, as a part of the [`sabre/dav`][2]
 project, which uses it heavily.
 
 It got split off into a separate library to make it easier to manage
-releases and hopefully giving it use outside of the scope of just SabreDAV.
+releases and hopefully giving it use outside of the scope of just `sabre/dav`.
 
 Although completely independently developed, this library has a LOT of
-overlap with [symfony's HttpFoundation][3].
+overlap with [Symfony's `HttpFoundation`][3].
 
 Said library does a lot more stuff and is significantly more popular,
 so if you are looking for something to fulfill this particular requirement,
-I'd recommend also considering [HttpFoundation][3].
+I'd recommend also considering [`HttpFoundation`][3].
 
 
 Getting started
@@ -96,7 +95,6 @@
 
 A response object you can just create as such:
 
-
 ```php
 use Sabre\HTTP;
 
@@ -120,29 +118,28 @@
 This line should generally also appear once in your application (at the very
 end).
 
-
 Decorators
 ----------
 
-It may be useful to extend the Request and Response objects in your
+It may be useful to extend the `Request` and `Response` objects in your
 application, if you for example would like them to carry a bit more
 information about the current request.
 
-For instance, you may want to add an `isLoggedIn()` method to the Request
+For instance, you may want to add an `isLoggedIn` method to the Request
 object.
 
 Simply extending Request and Response may pose some problems:
 
-1. You may want to extend the objects with new behavior differently, in
-   different subsystems of your application.
+1. You may want to extend the objects with new behaviors differently, in
+   different subsystems of your application,
 2. The `Sapi::getRequest` factory always returns a instance of
-   `Request` so you would have to override the factory method as well.
+   `Request` so you would have to override the factory method as well,
 3. By controlling the instantation and depend on specific `Request` and
    `Response` instances in your library or application, you make it harder to
    work with other applications which also use `sabre/http`.
 
 In short: it would be bad design. Instead, it's recommended to use the
-[decorator pattern][6] to add new behavior where you need it. sabre/http
+[decorator pattern][6] to add new behavior where you need it. `sabre/http`
 provides helper classes to quickly do this.
 
 Example:
@@ -185,8 +182,8 @@
 you to write simple clients, using the `Request` and `Response` objects you're
 already familiar with.
 
-It's by no means a replacement for something like [guzzle][7], but it provides
-a simple and lightweight api for making the occasional API call.
+It's by no means a replacement for something like [Guzzle][7], but it provides
+a simple and lightweight API for making the occasional API call.
 
 ### Usage
 
@@ -202,7 +199,7 @@
 echo $response->getBodyAsString();
 ```
 
-The client emits 3 event using [sabre/event][5]. `beforeRequest`,
+The client emits 3 event using [`sabre/event`][5]. `beforeRequest`,
 `afterRequest` and `error`.
 
 ```php
@@ -245,11 +242,11 @@
 
 ### Asynchronous requests
 
-The Client also supports doing asynchronous requests. This is especially handy
+The `Client` also supports doing asynchronous requests. This is especially handy
 if you need to perform a number of requests, that are allowed to be executed
 in parallel.
 
-The underlying system for this is simply [curl's multi request handler][8],
+The underlying system for this is simply [cURL's multi request handler][8],
 but this provides a much nicer API to handle this.
 
 Sample usage:
@@ -279,7 +276,7 @@
 
 ```
 
-Check out examples/asyncclient.php for more information.
+Check out `examples/asyncclient.php` for more information.
 
 Writing a reverse proxy
 -----------------------
@@ -323,7 +320,6 @@
 Sapi::sendResponse($response);
 ```
 
-
 The Request and Response API's
 ------------------------------
 
@@ -741,10 +737,10 @@
 This library is being developed by [fruux](https://fruux.com/). Drop us a line for commercial services or enterprise support.
 
 [1]: http://getcomposer.org/
-[2]: http://code.google.com/p/sabredav
+[2]: http://sabre.io/
 [3]: https://github.com/symfony/HttpFoundation
-[4]: http://uk3.php.net/curl
+[4]: http://php.net/curl
 [5]: https://github.com/fruux/sabre-event
 [6]: http://en.wikipedia.org/wiki/Decorator_pattern
 [7]: http://guzzlephp.org/
-[8]: http://www.php.net/manual/en/function.curl-multi-init.php
+[8]: http://php.net/curl_multi_init

sabre-http-3.0.5.tar.gz/bin/.empty Added

sabre-http-2.0.4.tar.gz/composer.json -> sabre-http-3.0.5.tar.gz/composer.json Changed

sabre-http-2.0.4.tar.gz/examples/asyncclient.php -> sabre-http-3.0.5.tar.gz/examples/asyncclient.php Changed

sabre-http-2.0.4.tar.gz/examples/basicauth.php -> sabre-http-3.0.5.tar.gz/examples/basicauth.php Changed

sabre-http-2.0.4.tar.gz/examples/client.php -> sabre-http-3.0.5.tar.gz/examples/client.php Changed

sabre-http-2.0.4.tar.gz/examples/stringify.php -> sabre-http-3.0.5.tar.gz/examples/stringify.php Changed

sabre-http-3.0.5.tar.gz/lib/Auth Added

sabre-http-3.0.5.tar.gz/lib/Auth/AWS.php Added

@@ -0,0 +1,234 @@
+<?php
+
+namespace Sabre\HTTP\Auth;
+
+use Sabre\HTTP\Util;
+
+/**
+ * HTTP AWS Authentication handler
+ *
+ * Use this class to leverage amazon's AWS authentication header
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class AWS extends AbstractAuth {
+
+    /**
+     * The signature supplied by the HTTP client
+     *
+     * @var string
+     */
+    private $signature = null;
+
+    /**
+     * The accesskey supplied by the HTTP client
+     *
+     * @var string
+     */
+    private $accessKey = null;
+
+    /**
+     * An error code, if any
+     *
+     * This value will be filled with one of the ERR_* constants
+     *
+     * @var int
+     */
+    public $errorCode = 0;
+
+    const ERR_NOAWSHEADER = 1;
+    const ERR_MD5CHECKSUMWRONG = 2;
+    const ERR_INVALIDDATEFORMAT = 3;
+    const ERR_REQUESTTIMESKEWED = 4;
+    const ERR_INVALIDSIGNATURE = 5;
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     *
+     * @return bool
+     */
+    function init() {
+
+        $authHeader = $this->request->getHeader('Authorization');
+        $authHeader = explode(' ',$authHeader);
+
+        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
+            $this->errorCode = self::ERR_NOAWSHEADER;
+             return false;
+        }
+
+        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
+
+        return true;
+
+    }
+
+    /**
+     * Returns the username for the request
+     *
+     * @return string
+     */
+    function getAccessKey() {
+
+        return $this->accessKey;
+
+    }
+
+    /**
+     * Validates the signature based on the secretKey
+     *
+     * @param string $secretKey
+     * @return bool
+     */
+    function validate($secretKey) {
+
+        $contentMD5 = $this->request->getHeader('Content-MD5');
+
+        if ($contentMD5) {
+            // We need to validate the integrity of the request
+            $body = $this->request->getBody(true);
+            $this->request->setBody($body,true);
+
+            if ($contentMD5!=base64_encode(md5($body,true))) {
+                // content-md5 header did not match md5 signature of body
+                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
+                return false;
+            }
+
+        }
+
+        if (!$requestDate = $this->request->getHeader('x-amz-date'))
+            $requestDate = $this->request->getHeader('Date');
+
+        if (!$this->validateRFC2616Date($requestDate))
+            return false;
+
+        $amzHeaders = $this->getAmzHeaders();
+
+        $signature = base64_encode(
+            $this->hmacsha1($secretKey,
+                $this->request->getMethod() . "\n" .
+                $contentMD5 . "\n" .
+                $this->request->getHeader('Content-type') . "\n" .
+                $requestDate . "\n" .
+                $amzHeaders .
+                $this->request->getUrl()
+            )
+        );
+
+        if ($this->signature != $signature) {
+
+            $this->errorCode = self::ERR_INVALIDSIGNATURE;
+            return false;
+
+        }
+
+        return true;
+
+    }
+
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    function requireLogin() {
+
+        $this->response->addHeader('WWW-Authenticate','AWS');
+        $this->response->setStatus(401);
+
+    }
+
+    /**
+     * Makes sure the supplied value is a valid RFC2616 date.
+     *
+     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
+     * user just supplied the word 'now' for the date header.
+     *
+     * This function also makes sure the Date header is within 15 minutes of the operating
+     * system date, to prevent replay attacks.
+     *
+     * @param string $dateHeader
+     * @return bool
+     */
+    protected function validateRFC2616Date($dateHeader) {
+
+        $date = Util::parseHTTPDate($dateHeader);
+
+        // Unknown format
+        if (!$date) {
+            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
+            return false;
+        }
+
+        $min = new \DateTime('-15 minutes');
+        $max = new \DateTime('+15 minutes');
+
+        // We allow 15 minutes around the current date/time
+        if ($date > $max || $date < $min) {
+            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
+            return false;
+        }
+
+        return $date;
+
+    }
+
+    /**
+     * Returns a list of AMZ headers
+     *
+     * @return string
+     */
+    protected function getAmzHeaders() {
+
+        $amzHeaders = [];
+        $headers = $this->request->getHeaders();
+        foreach($headers as $headerName => $headerValue) {
+            if (strpos(strtolower($headerName),'x-amz-')===0) {
+                $amzHeaders[strtolower($headerName)] = str_replace( ["\r\n"], [' '],$headerValue[0]) . "\n";
+            }
+        }
+        ksort($amzHeaders);
+

sabre-http-3.0.5.tar.gz/lib/Auth/AbstractAuth.php Added

@@ -0,0 +1,74 @@
+<?php
+
+namespace Sabre\HTTP\Auth;
+
+use
+    Sabre\HTTP\RequestInterface,
+    Sabre\HTTP\ResponseInterface;
+
+/**
+ * HTTP Authentication base class.
+ *
+ * This class provides some common functionality for the various base classes.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+abstract class AbstractAuth {
+
+    /**
+     * Authentication realm
+     *
+     * @var string
+     */
+    protected $realm;
+
+    /**
+     * Request object
+     *
+     * @var RequestInterface
+     */
+    protected $request;
+
+    /**
+     * Response object
+     *
+     * @var ResponseInterface
+     */
+    protected $response;
+
+    /**
+     * Creates the object
+     *
+     * @param string $realm
+     * @return void
+     */
+    function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
+
+        $this->realm = $realm;
+        $this->request = $request;
+        $this->response = $response;
+
+    }
+
+    /**
+     * This method sends the needed HTTP header and statuscode (401) to force
+     * the user to login.
+     *
+     * @return void
+     */
+    abstract function requireLogin();
+
+    /**
+     * Returns the HTTP realm
+     *
+     * @return string
+     */
+    function getRealm() {
+
+        return $this->realm;
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/lib/Auth/Basic.php Added

@@ -0,0 +1,57 @@
+<?php
+
+namespace Sabre\HTTP\Auth;
+
+/**
+ * HTTP Basic authentication utility.
+ *
+ * This class helps you setup basic auth. The process is fairly simple:
+ *
+ * 1. Instantiate the class.
+ * 2. Call getCredentials (this will return null or a user/pass pair)
+ * 3. If you didn't get valid credentials, call 'requireLogin'
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Basic extends AbstractAuth {
+
+    /**
+     * This method returns a numeric array with a username and password as the
+     * only elements.
+     *
+     * If no credentials were found, this method returns null.
+     *
+     * @return null|array
+     */
+    function getCredentials() {
+
+        $auth = $this->request->getHeader('Authorization');
+
+        if (!$auth) {
+            return null;
+        }
+
+        if (strtolower(substr($auth,0,6))!=='basic ') {
+            return null;
+        }
+
+        return explode(':',base64_decode(substr($auth, 6)), 2);
+
+    }
+
+    /**
+     * This method sends the needed HTTP header and statuscode (401) to force
+     * the user to login.
+     *
+     * @return void
+     */
+    function requireLogin() {
+
+        $this->response->addHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
+        $this->response->setStatus(401);
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/lib/Auth/Digest.php Added

@@ -0,0 +1,232 @@
+<?php
+
+namespace Sabre\HTTP\Auth;
+
+use
+    Sabre\HTTP\RequestInterface,
+    Sabre\HTTP\ResponseInterface;
+
+/**
+ * HTTP Digest Authentication handler
+ *
+ * Use this class for easy http digest authentication.
+ * Instructions:
+ *
+ *  1. Create the object
+ *  2. Call the setRealm() method with the realm you plan to use
+ *  3. Call the init method function.
+ *  4. Call the getUserName() function. This function may return null if no
+ *     authentication information was supplied. Based on the username you
+ *     should check your internal database for either the associated password,
+ *     or the so-called A1 hash of the digest.
+ *  5. Call either validatePassword() or validateA1(). This will return true
+ *     or false.
+ *  6. To make sure an authentication prompt is displayed, call the
+ *     requireLogin() method.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Digest extends AbstractAuth {
+
+    /**
+     * These constants are used in setQOP();
+     */
+    const QOP_AUTH = 1;
+    const QOP_AUTHINT = 2;
+
+    protected $nonce;
+    protected $opaque;
+    protected $digestParts;
+    protected $A1;
+    protected $qop = self::QOP_AUTH;
+
+    /**
+     * Initializes the object
+     */
+    function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
+
+        $this->nonce = uniqid();
+        $this->opaque = md5($realm);
+        parent::__construct($realm, $request, $response);
+
+    }
+
+    /**
+     * Gathers all information from the headers
+     *
+     * This method needs to be called prior to anything else.
+     *
+     * @return void
+     */
+    function init() {
+
+        $digest = $this->getDigest();
+        $this->digestParts = $this->parseDigest($digest);
+
+    }
+
+    /**
+     * Sets the quality of protection value.
+     *
+     * Possible values are:
+     *   Sabre\HTTP\DigestAuth::QOP_AUTH
+     *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
+     *
+     * Multiple values can be specified using logical OR.
+     *
+     * QOP_AUTHINT ensures integrity of the request body, but this is not
+     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
+     * request body to be md5'ed, which can put strains on CPU and memory.
+     *
+     * @param int $qop
+     * @return void
+     */
+    function setQOP($qop) {
+
+        $this->qop = $qop;
+
+    }
+
+    /**
+     * Validates the user.
+     *
+     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
+     *
+     * @param string $A1
+     * @return bool
+     */
+    function validateA1($A1) {
+
+        $this->A1 = $A1;
+        return $this->validate();
+
+    }
+
+    /**
+     * Validates authentication through a password. The actual password must be provided here.
+     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
+     *
+     * @param string $password
+     * @return bool
+     */
+    function validatePassword($password) {
+
+        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
+        return $this->validate();
+
+    }
+
+    /**
+     * Returns the username for the request
+     *
+     * @return string
+     */
+    function getUsername() {
+
+        return $this->digestParts['username'];
+
+    }
+
+    /**
+     * Validates the digest challenge
+     *
+     * @return bool
+     */
+    protected function validate() {
+
+        $A2 = $this->request->getMethod() . ':' . $this->digestParts['uri'];
+
+        if ($this->digestParts['qop']=='auth-int') {
+            // Making sure we support this qop value
+            if (!($this->qop & self::QOP_AUTHINT)) return false;
+            // We need to add an md5 of the entire request body to the A2 part of the hash
+            $body = $this->request->getBody($asString = true);
+            $this->request->setBody($body);
+            $A2 .= ':' . md5($body);
+        } else {
+
+            // We need to make sure we support this qop value
+            if (!($this->qop & self::QOP_AUTH)) return false;
+        }
+
+        $A2 = md5($A2);
+
+        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
+
+        return $this->digestParts['response']==$validResponse;
+
+
+    }
+
+    /**
+     * Returns an HTTP 401 header, forcing login
+     *
+     * This should be called when username and password are incorrect, or not supplied at all
+     *
+     * @return void
+     */
+    function requireLogin() {
+
+        $qop = '';
+        switch($this->qop) {
+            case self::QOP_AUTH    :
+                $qop = 'auth';
+                break;
+            case self::QOP_AUTHINT :
+                $qop = 'auth-int';
+                break;
+            case self::QOP_AUTH | self::QOP_AUTHINT :
+                $qop = 'auth,auth-int';
+                break;
+        }
+
+        $this->response->addHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+        $this->response->setStatus(401);
+
+    }
+
+
+    /**
+     * This method returns the full digest string.
+     *
+     * It should be compatibile with mod_php format and other webservers.
+     *
+     * If the header could not be found, null will be returned
+     *
+     * @return mixed
+     */

sabre-http-3.0.5.tar.gz/lib/Client.php Added

@@ -0,0 +1,589 @@
+<?php
+
+namespace Sabre\HTTP;
+
+use
+    Sabre\Event\EventEmitter;
+
+/**
+ * A rudimentary HTTP client.
+ *
+ * This object wraps PHP's curl extension and provides an easy way to send it a
+ * Request object, and return a Response object.
+ *
+ * This is by no means intended as the next best HTTP client, but it does the
+ * job and provides a simple integration with the rest of sabre/http.
+ *
+ * This client emits the following events:
+ *   beforeRequest(RequestInterface $request)
+ *   afterRequest(RequestInterface $request, ResponseInterface $response)
+ *   error(RequestInterface $request, ResponseInterface $response, bool &$retry, int $retryCount)
+ *
+ * The beforeRequest event allows you to do some last minute changes to the
+ * request before it's done, such as adding authentication headers.
+ *
+ * The afterRequest event will be emitted after the request is completed
+ * succesfully.
+ *
+ * If a HTTP error is returned (status code higher than 399) the error event is
+ * triggered. It's possible using this event to retry the request, by setting
+ * retry to true.
+ *
+ * The amount of times a request has retried is passed as $retryCount, which
+ * can be used to avoid retrying indefinitely. The first time the event is
+ * called, this will be 0.
+ *
+ * It's also possible to intercept specific http errors, by subscribing to for
+ * example 'error:401'.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Client extends EventEmitter {
+
+    /**
+     * List of curl settings
+     *
+     * @var array
+     */
+    protected $curlSettings = [];
+
+    /**
+     * Wether or not exceptions should be thrown when a HTTP error is returned.
+     *
+     * @var bool
+     */
+    protected $throwExceptions = false;
+
+    /**
+     * The maximum number of times we'll follow a redirect.
+     *
+     * @var int
+     */
+    protected $maxRedirects = 5;
+
+    /**
+     * Initializes the client.
+     *
+     * @return void
+     */
+    function __construct() {
+
+        $this->curlSettings = [
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_HEADER => true,
+            CURLOPT_NOBODY => false,
+        ];
+
+    }
+
+    /**
+     * Sends a request to a HTTP server, and returns a response.
+     *
+     * @param RequestInterface $request
+     * @return ResponseInterface
+     */
+    function send(RequestInterface $request) {
+
+        $this->emit('beforeRequest', [$request]);
+
+        $retryCount = 0;
+        $redirects = 0;
+
+        do {
+
+            $doRedirect = false;
+            $retry = false;
+
+            try {
+
+                $response = $this->doRequest($request);
+
+                $code = (int)$response->getStatus();
+
+                // We are doing in-PHP redirects, because curl's
+                // FOLLOW_LOCATION throws errors when PHP is configured with
+                // open_basedir.
+                //
+                // https://github.com/fruux/sabre-http/issues/12
+                if (in_array($code, [301, 302, 307, 308]) && $redirects < $this->maxRedirects) {
+
+                    $oldLocation = $request->getUrl();
+
+                    // Creating a new instance of the request object.
+                    $request = clone $request;
+
+                    // Setting the new location
+                    $request->setUrl(URLUtil::resolve(
+                        $oldLocation,
+                        $response->getHeader('Location')
+                    ));
+
+                    $doRedirect = true;
+                    $redirects++;
+
+                }
+
+                // This was a HTTP error
+                if ($code >= 400) {
+
+                    $this->emit('error', [$request, $response, &$retry, $retryCount]);
+                    $this->emit('error:' . $code, [$request, $response, &$retry, $retryCount]);
+
+                }
+
+            } catch (ClientException $e) {
+                $this->emit('exception', [$request, $e, &$retry, $retryCount]);
+
+                // If retry was still set to false, it means no event handler
+                // dealt with the problem. In this case we just re-throw the
+                // exception.
+                if (!$retry) {
+                    throw $e;
+                }
+            }
+            if ($retry) {
+                $retryCount++;
+            }
+
+        } while ($retry || $doRedirect);
+
+        $this->emit('afterRequest', [$request, $response]);
+
+        if ($this->throwExceptions && $code >= 400) {
+            throw new ClientHttpException($response);
+        }
+
+        return $response;
+
+    }
+
+    /**
+     * Sends a HTTP request asynchronously.
+     *
+     * Due to the nature of PHP, you must from time to time poll to see if any
+     * new responses came in.
+     *
+     * After calling sendAsync, you must therefore occasionally call the poll()
+     * method, or wait().
+     *
+     * @param RequestInterface $request
+     * @param callable $success
+     * @param callable $error
+     * @return void
+     */
+    function sendAsync(RequestInterface $request, callable $success = null, callable $error = null) {
+
+        $this->emit('beforeRequest', [$request]);
+        $this->sendAsyncInternal($request, $success, $error);
+        $this->poll();
+
+    }
+
+
+    /**
+     * This method checks if any http requests have gotten results, and if so,
+     * call the appropriate success or error handlers.
+     *
+     * This method will return true if there are still requests waiting to
+     * return, and false if all the work is done.
+     *
+     * @return bool
+     */
+    function poll() {
+
+        // nothing to do?
+        if(!$this->curlMultiMap) {
+            return false;
+        }

sabre-http-3.0.5.tar.gz/lib/ClientException.php Added

sabre-http-3.0.5.tar.gz/lib/ClientHttpException.php Added

@@ -0,0 +1,58 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * This exception represents a HTTP error coming from the Client.
+ *
+ * By default the Client will not emit these, this has to be explicitly enabled
+ * with the setThrowExceptions method.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class ClientHttpException extends \Exception implements HttpException {
+
+    /**
+     * Response object
+     *
+     * @var ResponseInterface
+     */
+    protected $response;
+
+    /**
+     * Constructor
+     *
+     * @param ResponseInterface $response
+     */
+    function __construct(ResponseInterface $response) {
+
+        $this->response = $response;
+        parent::__construct($response->getStatusText(), $response->getStatus());
+
+    }
+
+    /**
+     * The http status code for the error.
+     *
+     * @return int
+     */
+    function getHttpStatus() {
+
+        return $this->response->getStatus();
+
+    }
+
+    /**
+     * Returns the full response object.
+     *
+     * @return ResponseInterface
+     */
+    function getResponse() {
+
+        return $this->response;
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/lib/HttpException.php Added

sabre-http-3.0.5.tar.gz/lib/Message.php Added

@@ -0,0 +1,309 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * This is the abstract base class for both the Request and Response objects.
+ *
+ * This object contains a few simple methods that are shared by both.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+abstract class Message implements MessageInterface {
+
+    /**
+     * Request body
+     *
+     * This should be a stream resource
+     *
+     * @var resource
+     */
+    protected $body;
+
+    /**
+     * Contains the list of HTTP headers
+     *
+     * @var array
+     */
+    protected $headers = [];
+
+    /**
+     * HTTP message version (1.0 or 1.1)
+     *
+     * @var string
+     */
+    protected $httpVersion = '1.1';
+
+    /**
+     * Returns the body as a readable stream resource.
+     *
+     * Note that the stream may not be rewindable, and therefore may only be
+     * read once.
+     *
+     * @return resource
+     */
+    function getBodyAsStream() {
+
+        $body = $this->getBody();
+        if (is_string($body) || is_null($body)) {
+            $stream = fopen('php://temp', 'r+');
+            fwrite($stream, $body);
+            rewind($stream);
+            return $stream;
+        }
+        return $body;
+
+    }
+
+    /**
+     * Returns the body as a string.
+     *
+     * Note that because the underlying data may be based on a stream, this
+     * method could only work correctly the first time.
+     *
+     * @return string
+     */
+    function getBodyAsString() {
+
+        $body = $this->getBody();
+        if (is_string($body)) {
+            return $body;
+        }
+        if (is_null($body)) {
+            return '';
+        }
+        return stream_get_contents($body);
+
+    }
+
+    /**
+     * Returns the message body, as it's internal representation.
+     *
+     * This could be either a string or a stream.
+     *
+     * @return resource|string
+     */
+    function getBody() {
+
+        return $this->body;
+
+    }
+
+    /**
+     * Replaces the body resource with a new stream or string.
+     *
+     * @param resource $body
+     */
+    function setBody($body) {
+
+        $this->body = $body;
+
+    }
+
+    /**
+     * Returns all the HTTP headers as an array.
+     *
+     * Every header is returned as an array, with one or more values.
+     *
+     * @return array
+     */
+    function getHeaders() {
+
+        $result = [];
+        foreach($this->headers as $headerInfo) {
+            $result[$headerInfo[0]] = $headerInfo[1];
+        }
+        return $result;
+
+    }
+
+    /**
+     * Will return true or false, depending on if a HTTP header exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    function hasHeader($name) {
+
+        return isset($this->headers[strtolower($name)]);
+
+    }
+
+    /**
+     * Returns a specific HTTP header, based on it's name.
+     *
+     * The name must be treated as case-insensitive.
+     * If the header does not exist, this method must return null.
+     *
+     * If a header appeared more than once in a HTTP request, this method will
+     * concatenate all the values with a comma.
+     *
+     * Note that this not make sense for all headers. Some, such as
+     * `Set-Cookie` cannot be logically combined with a comma. In those cases
+     * you *should* use getHeaderAsArray().
+     *
+     * @param string $name
+     * @return string|null
+     */
+    function getHeader($name) {
+
+        $name = strtolower($name);
+
+        if (isset($this->headers[$name])) {
+            return implode(',', $this->headers[$name][1]);
+        }
+        return null;
+
+    }
+
+    /**
+     * Returns a HTTP header as an array.
+     *
+     * For every time the HTTP header appeared in the request or response, an
+     * item will appear in the array.
+     *
+     * If the header did not exists, this method will return an empty array.
+     *
+     * @param string $name
+     * @return string[]
+     */
+    function getHeaderAsArray($name) {
+
+        $name = strtolower($name);
+
+        if (isset($this->headers[$name])) {
+            return $this->headers[$name][1];
+        }
+
+        return [];
+
+    }
+
+    /**
+     * Updates a HTTP header.
+     *
+     * The case-sensitity of the name value must be retained as-is.
+     *
+     * If the header already existed, it will be overwritten.
+     *
+     * @param string $name
+     * @param string|string[] $value
+     * @return void
+     */
+    function setHeader($name, $value) {
+
+        $this->headers[strtolower($name)] = [$name, (array)$value];
+
+    }

sabre-http-3.0.5.tar.gz/lib/MessageDecoratorTrait.php Added

@@ -0,0 +1,250 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * This trait contains a bunch of methods, shared by both the RequestDecorator
+ * and the ResponseDecorator.
+ *
+ * Didn't seem needed to create a full class for this, so we're just
+ * implementing it as a trait.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+trait MessageDecoratorTrait {
+
+    /**
+     * The inner request object.
+     *
+     * All method calls will be forwarded here.
+     *
+     * @var MessageInterface
+     */
+    protected $inner;
+
+    /**
+     * Returns the body as a readable stream resource.
+     *
+     * Note that the stream may not be rewindable, and therefore may only be
+     * read once.
+     *
+     * @return resource
+     */
+    function getBodyAsStream() {
+
+        return $this->inner->getBodyAsStream();
+
+    }
+
+    /**
+     * Returns the body as a string.
+     *
+     * Note that because the underlying data may be based on a stream, this
+     * method could only work correctly the first time.
+     *
+     * @return string
+     */
+    function getBodyAsString() {
+
+        return $this->inner->getBodyAsString();
+
+    }
+
+    /**
+     * Returns the message body, as it's internal representation.
+     *
+     * This could be either a string or a stream.
+     *
+     * @return resource|string
+     */
+    function getBody() {
+
+        return $this->inner->getBody();
+
+    }
+
+    /**
+     * Updates the body resource with a new stream.
+     *
+     * @param resource $body
+     * @return void
+     */
+    function setBody($body) {
+
+        $this->inner->setBody($body);
+
+    }
+
+    /**
+     * Returns all the HTTP headers as an array.
+     *
+     * Every header is returned as an array, with one or more values.
+     *
+     * @return array
+     */
+    function getHeaders() {
+
+        return $this->inner->getHeaders();
+
+    }
+
+    /**
+     * Will return true or false, depending on if a HTTP header exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    function hasHeader($name) {
+
+        return $this->inner->hasHeader($name);
+
+    }
+
+    /**
+     * Returns a specific HTTP header, based on it's name.
+     *
+     * The name must be treated as case-insensitive.
+     * If the header does not exist, this method must return null.
+     *
+     * If a header appeared more than once in a HTTP request, this method will
+     * concatenate all the values with a comma.
+     *
+     * Note that this not make sense for all headers. Some, such as
+     * `Set-Cookie` cannot be logically combined with a comma. In those cases
+     * you *should* use getHeaderAsArray().
+     *
+     * @param string $name
+     * @return string|null
+     */
+    function getHeader($name) {
+
+        return $this->inner->getHeader($name);
+
+    }
+
+    /**
+     * Returns a HTTP header as an array.
+     *
+     * For every time the HTTP header appeared in the request or response, an
+     * item will appear in the array.
+     *
+     * If the header did not exists, this method will return an empty array.
+     *
+     * @param string $name
+     * @return string[]
+     */
+    function getHeaderAsArray($name) {
+
+        return $this->inner->getHeaderAsArray($name);
+
+    }
+
+    /**
+     * Updates a HTTP header.
+     *
+     * The case-sensitity of the name value must be retained as-is.
+     *
+     * If the header already existed, it will be overwritten.
+     *
+     * @param string $name
+     * @param string|string[] $value
+     * @return void
+     */
+    function setHeader($name, $value) {
+
+        $this->inner->setHeader($name, $value);
+
+    }
+
+    /**
+     * Sets a new set of HTTP headers.
+     *
+     * The headers array should contain headernames for keys, and their value
+     * should be specified as either a string or an array.
+     *
+     * Any header that already existed will be overwritten.
+     *
+     * @param array $headers
+     * @return void
+     */
+    function setHeaders(array $headers) {
+
+        $this->inner->setHeaders($headers);
+
+    }
+
+    /**
+     * Adds a HTTP header.
+     *
+     * This method will not overwrite any existing HTTP header, but instead add
+     * another value. Individual values can be retrieved with
+     * getHeadersAsArray.
+     *
+     * @param string $name
+     * @param string $value
+     * @return void
+     */
+    function addHeader($name, $value) {
+
+        $this->inner->addHeader($name, $value);
+
+    }
+
+    /**
+     * Adds a new set of HTTP headers.
+     *
+     * Any existing headers will not be overwritten.
+     *

sabre-http-3.0.5.tar.gz/lib/MessageInterface.php Added

@@ -0,0 +1,177 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * The MessageInterface is the base interface that's used by both
+ * the RequestInterface and ResponseInterface.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+interface MessageInterface {
+
+    /**
+     * Returns the body as a readable stream resource.
+     *
+     * Note that the stream may not be rewindable, and therefore may only be
+     * read once.
+     *
+     * @return resource
+     */
+    function getBodyAsStream();
+
+    /**
+     * Returns the body as a string.
+     *
+     * Note that because the underlying data may be based on a stream, this
+     * method could only work correctly the first time.
+     *
+     * @return string
+     */
+    function getBodyAsString();
+
+    /**
+     * Returns the message body, as it's internal representation.
+     *
+     * This could be either a string or a stream.
+     *
+     * @return resource|string
+     */
+    function getBody();
+
+    /**
+     * Updates the body resource with a new stream.
+     *
+     * @param resource $body
+     * @return void
+     */
+    function setBody($body);
+
+    /**
+     * Returns all the HTTP headers as an array.
+     *
+     * Every header is returned as an array, with one or more values.
+     *
+     * @return array
+     */
+    function getHeaders();
+
+    /**
+     * Will return true or false, depending on if a HTTP header exists.
+     *
+     * @param string $name
+     * @return bool
+     */
+    function hasHeader($name);
+
+    /**
+     * Returns a specific HTTP header, based on it's name.
+     *
+     * The name must be treated as case-insensitive.
+     * If the header does not exist, this method must return null.
+     *
+     * If a header appeared more than once in a HTTP request, this method will
+     * concatenate all the values with a comma.
+     *
+     * Note that this not make sense for all headers. Some, such as
+     * `Set-Cookie` cannot be logically combined with a comma. In those cases
+     * you *should* use getHeaderAsArray().
+     *
+     * @param string $name
+     * @return string|null
+     */
+    function getHeader($name);
+
+    /**
+     * Returns a HTTP header as an array.
+     *
+     * For every time the HTTP header appeared in the request or response, an
+     * item will appear in the array.
+     *
+     * If the header did not exists, this method will return an empty array.
+     *
+     * @param string $name
+     * @return string[]
+     */
+    function getHeaderAsArray($name);
+
+    /**
+     * Updates a HTTP header.
+     *
+     * The case-sensitity of the name value must be retained as-is.
+     *
+     * If the header already existed, it will be overwritten.
+     *
+     * @param string $name
+     * @param string|string[] $value
+     * @return void
+     */
+    function setHeader($name, $value);
+
+    /**
+     * Sets a new set of HTTP headers.
+     *
+     * The headers array should contain headernames for keys, and their value
+     * should be specified as either a string or an array.
+     *
+     * Any header that already existed will be overwritten.
+     *
+     * @param array $headers
+     * @return void
+     */
+    function setHeaders(array $headers);
+
+    /**
+     * Adds a HTTP header.
+     *
+     * This method will not overwrite any existing HTTP header, but instead add
+     * another value. Individual values can be retrieved with
+     * getHeadersAsArray.
+     *
+     * @param string $name
+     * @param string $value
+     * @return void
+     */
+    function addHeader($name, $value);
+
+    /**
+     * Adds a new set of HTTP headers.
+     *
+     * Any existing headers will not be overwritten.
+     *
+     * @param array $headers
+     * @return void
+     */
+    function addHeaders(array $headers);
+
+    /**
+     * Removes a HTTP header.
+     *
+     * The specified header name must be treated as case-insenstive.
+     * This method should return true if the header was successfully deleted,
+     * and false if the header did not exist.
+     *
+     * @return bool
+     */
+    function removeHeader($name);
+
+    /**
+     * Sets the HTTP version.
+     *
+     * Should be 1.0 or 1.1.
+     *
+     * @param string $version
+     * @return void
+     */
+    function setHttpVersion($version);
+
+    /**
+     * Returns the HTTP version.
+     *
+     * @return string
+     */
+    function getHttpVersion();
+
+}

sabre-http-3.0.5.tar.gz/lib/Request.php Added

@@ -0,0 +1,312 @@
+<?php
+
+namespace Sabre\HTTP;
+
+use InvalidArgumentException;
+
+/**
+ * The Request class represents a single HTTP request.
+ *
+ * You can either simply construct the object from scratch, or if you need
+ * access to the current HTTP request, use Sapi::getRequest.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Request extends Message implements RequestInterface {
+
+    /**
+     * HTTP Method
+     *
+     * @var string
+     */
+    protected $method;
+
+    /**
+     * Request Url
+     *
+     * @var string
+     */
+    protected $url;
+
+    /**
+     * Creates the request object
+     *
+     * @param string $method
+     * @param string $url
+     * @param array $headers
+     * @param resource $body
+     */
+    function __construct($method = null, $url = null, array $headers = null, $body = null) {
+
+        if (is_array($method)) {
+            throw new InvalidArgumentException('The first argument for this constructor should be a string or null, not an array. Did you upgrade from sabre/http 1.0 to 2.0?');
+        }
+        if (!is_null($method))      $this->setMethod($method);
+        if (!is_null($url))         $this->setUrl($url);
+        if (!is_null($headers))     $this->setHeaders($headers);
+        if (!is_null($body))        $this->setBody($body);
+
+    }
+
+    /**
+     * Returns the current HTTP method
+     *
+     * @return string
+     */
+    function getMethod() {
+
+        return $this->method;
+
+    }
+
+    /**
+     * Sets the HTTP method
+     *
+     * @param string $method
+     * @return void
+     */
+    function setMethod($method) {
+
+        $this->method = $method;
+
+    }
+
+    /**
+     * Returns the request url.
+     *
+     * @return string
+     */
+    function getUrl() {
+
+        return $this->url;
+
+    }
+
+    /**
+     * Sets the request url.
+     *
+     * @param string $url
+     * @return void
+     */
+    function setUrl($url) {
+
+        $this->url = $url;
+
+    }
+
+    /**
+     * Returns the list of query parameters.
+     *
+     * This is equivalent to PHP's $_GET superglobal.
+     *
+     * @return array
+     */
+    function getQueryParameters() {
+
+        $url = $this->getUrl();
+        if (($index = strpos($url,'?'))===false) {
+            return [];
+        } else {
+            parse_str(substr($url, $index+1), $queryParams);
+            return $queryParams;
+        }
+
+    }
+
+    /**
+     * Sets the absolute url.
+     *
+     * @param string $url
+     * @return void
+     */
+    function setAbsoluteUrl($url) {
+
+        $this->absoluteUrl = $url;
+
+    }
+
+    /**
+     * Returns the absolute url.
+     *
+     * @return string
+     */
+    function getAbsoluteUrl() {
+
+        return $this->absoluteUrl;
+
+    }
+
+    /**
+     * Base url
+     *
+     * @var string
+     */
+    protected $baseUrl = '/';
+
+    /**
+     * Sets a base url.
+     *
+     * This url is used for relative path calculations.
+     *
+     * @param string $url
+     * @return void
+     */
+    function setBaseUrl($url) {
+
+        $this->baseUrl = $url;
+
+    }
+
+    /**
+     * Returns the current base url.
+     *
+     * @return string
+     */
+    function getBaseUrl() {
+
+        return $this->baseUrl;
+
+    }
+
+    /**
+     * Returns the relative path.
+     *
+     * This is being calculated using the base url. This path will not start
+     * with a slash, so it will always return something like
+     * 'example/path.html'.
+     *
+     * If the full path is equal to the base url, this method will return an
+     * empty string.
+     *
+     * This method will also urldecode the path, and if the url was incoded as
+     * ISO-8859-1, it will convert it to UTF-8.
+     *
+     * If the path is outside of the base url, a LogicException will be thrown.
+     *
+     * @return string
+     */
+    function getPath() {
+
+        // Removing duplicated slashes.
+        $uri = str_replace('//','/',$this->getUrl());
+
+        if (strpos($uri,$this->getBaseUrl())===0) {
+
+            // We're not interested in the query part (everything after the ?).
+            list($uri) = explode('?', $uri);
+            return trim(URLUtil::decodePath(substr($uri,strlen($this->getBaseUrl()))),'/');

sabre-http-3.0.5.tar.gz/lib/RequestDecorator.php Added

@@ -0,0 +1,231 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * Request Decorator
+ *
+ * This helper class allows you to easily create decorators for the Request
+ * object.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class RequestDecorator implements RequestInterface {
+
+    use MessageDecoratorTrait;
+
+    /**
+     * Constructor.
+     *
+     * @param RequestInterface $inner
+     */
+    function __construct(RequestInterface $inner) {
+
+        $this->inner = $inner;
+
+    }
+
+    /**
+     * Returns the current HTTP method
+     *
+     * @return string
+     */
+    function getMethod() {
+
+        return $this->inner->getMethod();
+
+    }
+
+    /**
+     * Sets the HTTP method
+     *
+     * @param string $method
+     * @return void
+     */
+    function setMethod($method) {
+
+        $this->inner->setMethod($method);
+
+    }
+
+    /**
+     * Returns the request url.
+     *
+     * @return string
+     */
+    function getUrl() {
+
+        return $this->inner->getUrl();
+
+    }
+
+    /**
+     * Sets the request url.
+     *
+     * @param string $url
+     * @return void
+     */
+    function setUrl($url) {
+
+        $this->inner->setUrl($url);
+
+    }
+
+    /**
+     * Returns the absolute url.
+     *
+     * @return string
+     */
+    function getAbsoluteUrl() {
+
+        return $this->inner->getAbsoluteUrl();
+
+    }
+
+    /**
+     * Sets the absolute url.
+     *
+     * @param string $url
+     * @return void
+     */
+    function setAbsoluteUrl($url) {
+
+        $this->inner->setAbsoluteUrl($url);
+
+    }
+
+    /**
+     * Returns the current base url.
+     *
+     * @return string
+     */
+    function getBaseUrl() {
+
+        return $this->inner->getBaseUrl();
+
+    }
+
+    /**
+     * Sets a base url.
+     *
+     * This url is used for relative path calculations.
+     *
+     * The base url should default to /
+     *
+     * @param string $url
+     * @return void
+     */
+    function setBaseUrl($url) {
+
+        $this->inner->setBaseUrl($url);
+
+    }
+
+    /**
+     * Returns the relative path.
+     *
+     * This is being calculated using the base url. This path will not start
+     * with a slash, so it will always return something like
+     * 'example/path.html'.
+     *
+     * If the full path is equal to the base url, this method will return an
+     * empty string.
+     *
+     * This method will also urldecode the path, and if the url was incoded as
+     * ISO-8859-1, it will convert it to UTF-8.
+     *
+     * If the path is outside of the base url, a LogicException will be thrown.
+     *
+     * @return string
+     */
+    function getPath() {
+
+        return $this->inner->getPath();
+
+    }
+
+    /**
+     * Returns the list of query parameters.
+     *
+     * This is equivalent to PHP's $_GET superglobal.
+     *
+     * @return array
+     */
+    function getQueryParameters() {
+
+        return $this->inner->getQueryParameters();
+
+    }
+
+    /**
+     * Returns the POST data.
+     *
+     * This is equivalent to PHP's $_POST superglobal.
+     *
+     * @return array
+     */
+    function getPostData() {
+
+        return $this->inner->getPostData();
+
+    }
+
+    /**
+     * Sets the post data.
+     *
+     * This is equivalent to PHP's $_POST superglobal.
+     *
+     * This would not have been needed, if POST data was accessible as
+     * php://input, but unfortunately we need to special case it.
+     *
+     * @param array $postData
+     * @return void
+     */
+    function setPostData(array $postData) {
+
+        $this->inner->setPostData($postData);
+
+    }
+
+
+    /**
+     * Returns an item from the _SERVER array.
+     *
+     * If the value does not exist in the array, null is returned.
+     *
+     * @param string $valueName
+     * @return string|null

sabre-http-3.0.5.tar.gz/lib/RequestInterface.php Added

@@ -0,0 +1,147 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * The RequestInterface represents a HTTP request.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+interface RequestInterface extends MessageInterface {
+
+    /**
+     * Returns the current HTTP method
+     *
+     * @return string
+     */
+    function getMethod();
+
+    /**
+     * Sets the HTTP method
+     *
+     * @param string $method
+     * @return void
+     */
+    function setMethod($method);
+
+    /**
+     * Returns the request url.
+     *
+     * @return string
+     */
+    function getUrl();
+
+    /**
+     * Sets the request url.
+     *
+     * @param string $url
+     * @return void
+     */
+    function setUrl($url);
+
+    /**
+     * Returns the absolute url.
+     *
+     * @return string
+     */
+    function getAbsoluteUrl();
+
+    /**
+     * Sets the absolute url.
+     *
+     * @param string $url
+     * @return void
+     */
+    function setAbsoluteUrl($url);
+
+    /**
+     * Returns the current base url.
+     *
+     * @return string
+     */
+    function getBaseUrl();
+
+    /**
+     * Sets a base url.
+     *
+     * This url is used for relative path calculations.
+     *
+     * The base url should default to /
+     *
+     * @param string $url
+     * @return void
+     */
+    function setBaseUrl($url);
+
+    /**
+     * Returns the relative path.
+     *
+     * This is being calculated using the base url. This path will not start
+     * with a slash, so it will always return something like
+     * 'example/path.html'.
+     *
+     * If the full path is equal to the base url, this method will return an
+     * empty string.
+     *
+     * This method will also urldecode the path, and if the url was incoded as
+     * ISO-8859-1, it will convert it to UTF-8.
+     *
+     * If the path is outside of the base url, a LogicException will be thrown.
+     *
+     * @return string
+     */
+    function getPath();
+
+    /**
+     * Returns the list of query parameters.
+     *
+     * This is equivalent to PHP's $_GET superglobal.
+     *
+     * @return array
+     */
+    function getQueryParameters();
+
+    /**
+     * Returns the POST data.
+     *
+     * This is equivalent to PHP's $_POST superglobal.
+     *
+     * @return array
+     */
+    function getPostData();
+
+    /**
+     * Sets the post data.
+     *
+     * This is equivalent to PHP's $_POST superglobal.
+     *
+     * This would not have been needed, if POST data was accessible as
+     * php://input, but unfortunately we need to special case it.
+     *
+     * @param array $postData
+     * @return void
+     */
+    function setPostData(array $postData);
+
+    /**
+     * Returns an item from the _SERVER array.
+     *
+     * If the value does not exist in the array, null is returned.
+     *
+     * @param string $valueName
+     * @return string|null
+     */
+    function getRawServerValue($valueName);
+
+    /**
+     * Sets the _SERVER array.
+     *
+     * @param array $data
+     * @return void
+     */
+    function setRawServerData(array $data);
+
+
+}

sabre-http-3.0.5.tar.gz/lib/Response.php Added

@@ -0,0 +1,193 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * This class represents a single HTTP response.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Response extends Message implements ResponseInterface {
+
+    /**
+     * This is the list of currently registered HTTP status codes.
+     *
+     * @var array
+     */
+    static $statusCodes = [
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authorative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        207 => 'Multi-Status', // RFC 4918
+        208 => 'Already Reported', // RFC 5842
+        226 => 'IM Used', // RFC 3229
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        307 => 'Temporary Redirect',
+        308 => 'Permanent Redirect',
+        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',
+        418 => 'I\'m a teapot', // RFC 2324
+        422 => 'Unprocessable Entity', // RFC 4918
+        423 => 'Locked', // RFC 4918
+        424 => 'Failed Dependency', // RFC 4918
+        426 => 'Upgrade Required',
+        428 => 'Precondition Required', // RFC 6585
+        429 => 'Too Many Requests', // RFC 6585
+        431 => 'Request Header Fields Too Large', // RFC 6585
+        451 => 'Unavailable For Legal Reasons', // draft-tbray-http-legally-restricted-status
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version not supported',
+        506 => 'Variant Also Negotiates',
+        507 => 'Insufficient Storage', // RFC 4918
+        508 => 'Loop Detected', // RFC 5842
+        509 => 'Bandwidth Limit Exceeded', // non-standard
+        510 => 'Not extended',
+        511 => 'Network Authentication Required', // RFC 6585
+    ];
+
+    /**
+     * HTTP status code
+     *
+     * @var int
+     */
+    protected $status;
+
+    /**
+     * HTTP status text
+     *
+     * @var string
+     */
+    protected $statusText;
+
+    /**
+     * Creates the response object
+     *
+     * @param string|int $status
+     * @param array $headers
+     * @param resource $body
+     * @return void
+     */
+    function __construct($status = null, array $headers = null, $body = null) {
+
+        if (!is_null($status)) $this->setStatus($status);
+        if (!is_null($headers)) $this->setHeaders($headers);
+        if (!is_null($body)) $this->setBody($body);
+
+    }
+
+
+    /**
+     * Returns the current HTTP status code.
+     *
+     * @return int
+     */
+    function getStatus() {
+
+        return $this->status;
+
+    }
+
+    /**
+     * Returns the human-readable status string.
+     *
+     * In the case of a 200, this may for example be 'OK'.
+     *
+     * @return string
+     */
+    function getStatusText() {
+
+        return $this->statusText;
+
+    }
+
+    /**
+     * Sets the HTTP status code.
+     *
+     * This can be either the full HTTP status code with human readable string,
+     * for example: "403 I can't let you do that, Dave".
+     *
+     * Or just the code, in which case the appropriate default message will be
+     * added.
+     *
+     * @param string|int $status
+     * @throws \InvalidArgumentExeption
+     * @return void
+     */
+    function setStatus($status) {
+
+        if (ctype_digit($status) || is_int($status)) {
+
+            $statusCode = $status;
+            $statusText = isset(self::$statusCodes[$status])?self::$statusCodes[$status]:'Unknown';
+
+        } else {
+            list(
+                $statusCode,
+                $statusText
+            ) = explode(' ', $status, 2);
+        }
+        if ($statusCode < 100 || $statusCode > 999) {
+            throw new \InvalidArgumentException('The HTTP status code must be exactly 3 digits');
+        }
+
+        $this->status = $statusCode;
+        $this->statusText = $statusText;
+
+    }
+
+    /**
+     * Serializes the response object as a string.
+     *
+     * This is useful for debugging purposes.
+     *
+     * @return string
+     */
+    function __toString() {
+
+        $str = 'HTTP/' . $this->httpVersion . ' ' . $this->getStatus() . ' ' . $this->getStatusText() . "\r\n";
+        foreach($this->getHeaders() as $key=>$value) {
+            foreach($value as $v) {
+                $str.= $key . ": " . $v . "\r\n";
+            }
+        }
+        $str.="\r\n";
+        $str.=$this->getBodyAsString();
+        return $str;
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/lib/ResponseDecorator.php Added

@@ -0,0 +1,84 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * Response Decorator
+ *
+ * This helper class allows you to easily create decorators for the Response
+ * object.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class ResponseDecorator implements ResponseInterface {
+
+    use MessageDecoratorTrait;
+
+    /**
+     * Constructor.
+     *
+     * @param ResponseInterface $inner
+     */
+    function __construct(ResponseInterface $inner) {
+
+        $this->inner = $inner;
+
+    }
+
+    /**
+     * Returns the current HTTP status code.
+     *
+     * @return int
+     */
+    function getStatus() {
+
+        return $this->inner->getStatus();
+
+    }
+
+
+    /**
+     * Returns the human-readable status string.
+     *
+     * In the case of a 200, this may for example be 'OK'.
+     *
+     * @return string
+     */
+    function getStatusText() {
+
+        return $this->inner->getStatusText();
+
+    }
+    /**
+     * Sets the HTTP status code.
+     *
+     * This can be either the full HTTP status code with human readable string,
+     * for example: "403 I can't let you do that, Dave".
+     *
+     * Or just the code, in which case the appropriate default message will be
+     * added.
+     *
+     * @param string|int $status
+     * @return void
+     */
+    function setStatus($status) {
+
+        $this->inner->setStatus($status);
+
+    }
+
+    /**
+     * Serializes the request object as a string.
+     *
+     * This is useful for debugging purposes.
+     *
+     * @return string
+     */
+    function __toString() {
+
+        return $this->inner->__toString();
+
+    }
+}

sabre-http-3.0.5.tar.gz/lib/ResponseInterface.php Added

@@ -0,0 +1,45 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * This interface represents a HTTP response.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+interface ResponseInterface extends MessageInterface {
+
+    /**
+     * Returns the current HTTP status code.
+     *
+     * @return int
+     */
+    function getStatus();
+
+    /**
+     * Returns the human-readable status string.
+     *
+     * In the case of a 200, this may for example be 'OK'.
+     *
+     * @return string
+     */
+    function getStatusText();
+
+    /**
+     * Sets the HTTP status code.
+     *
+     * This can be either the full HTTP status code with human readable string,
+     * for example: "403 I can't let you do that, Dave".
+     *
+     * Or just the code, in which case the appropriate default message will be
+     * added.
+     *
+     * @param string|int $status
+     * @throws \InvalidArgumentExeption
+     * @return void
+     */
+    function setStatus($status);
+
+}

sabre-http-3.0.5.tar.gz/lib/Sapi.php Added

@@ -0,0 +1,176 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * PHP SAPI
+ *
+ * This object is responsible for:
+ * 1. Constructing a Request object based on the current HTTP request sent to
+ *    the PHP process.
+ * 2. Sending the Response object back to the client.
+ *
+ * It could be said that this class provides a mapping between the Request and
+ * Response objects, and php's:
+ *
+ * * $_SERVER
+ * * $_POST
+ * * $_FILES
+ * * php://input
+ * * echo()
+ * * header()
+ * * php://output
+ *
+ * You can choose to either call all these methods statically, but you can also
+ * instantiate this as an object to allow for polymorhpism.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Sapi {
+
+    /**
+     * This static method will create a new Request object, based on the
+     * current PHP request.
+     *
+     * @return Request
+     */
+    static function getRequest() {
+
+        $r = self::createFromServerArray($_SERVER);
+        $r->setBody(fopen('php://input','r'));
+        $r->setPostData($_POST);
+        return $r;
+
+    }
+
+    /**
+     * Sends the HTTP response back to a HTTP client.
+     *
+     * This calls php's header() function and streams the body to php://output.
+     *
+     * @param ResponseInterface $response
+     * @return void
+     */
+    static function sendResponse(ResponseInterface $response) {
+
+        header('HTTP/' . $response->getHttpVersion() . ' ' . $response->getStatus() . ' ' . $response->getStatusText());
+        foreach($response->getHeaders() as $key=>$value) {
+
+            foreach($value as $k=>$v) {
+                if ($k === 0) {
+                    header($key . ': ' . $v);
+                } else {
+                    header($key . ': ' . $v, false);
+                }
+            }
+
+        }
+        file_put_contents('php://output', $response->getBody());
+
+    }
+
+    /**
+     * This static method will create a new Request object, based on a PHP
+     * $_SERVER array.
+     *
+     * @param array $serverArray
+     * @return Request
+     */
+    static function createFromServerArray(array $serverArray) {
+
+        $headers = [];
+        $method = null;
+        $url = null;
+        $httpVersion = '1.1';
+
+        $protocol = 'http';
+        $hostName = 'localhost';
+
+        foreach($serverArray as $key=>$value) {
+
+            switch($key) {
+
+                case 'SERVER_PROTOCOL' :
+                    if ($value==='HTTP/1.0') {
+                        $httpVersion = '1.0';
+                    }
+                    break;
+                case 'REQUEST_METHOD' :
+                    $method = $value;
+                    break;
+                case 'REQUEST_URI' :
+                    $url = $value;
+                    break;
+
+                // These sometimes should up without a HTTP_ prefix
+                case 'CONTENT_TYPE' :
+                    $headers['Content-Type'] = $value;
+                    break;
+                case 'CONTENT_LENGTH' :
+                    $headers['Content-Length'] = $value;
+                    break;
+
+                // mod_php on apache will put credentials in these variables.
+                // (fast)cgi does not usually do this, however.
+                case 'PHP_AUTH_USER' :
+                    if (isset($serverArray['PHP_AUTH_PW'])) {
+                        $headers['Authorization'] = 'Basic ' . base64_encode($value . ':' . $serverArray['PHP_AUTH_PW']);
+                    }
+                    break;
+
+                // Similarly, mod_php may also screw around with digest auth.
+                case 'PHP_AUTH_DIGEST' :
+                    $headers['Authorization'] = 'Digest ' . $value;
+                    break;
+
+                // Apache may prefix the HTTP_AUTHORIZATION header with
+                // REDIRECT_, if mod_rewrite was used.
+                case 'REDIRECT_HTTP_AUTHORIZATION' :
+                    $headers['Authorization'] = $value;
+                    break;
+
+                case 'HTTP_HOST' :
+                    $hostName = $value;
+                    $headers['Host'] = $value;
+                    break;
+
+                case 'HTTPS' :
+                    if (!empty($value) && $value!=='off') {
+                        $protocol = 'https';
+                    }
+                    break;
+
+                default :
+                    if (substr($key,0,5)==='HTTP_') {
+                        // It's a HTTP header
+
+                        // Normalizing it to be prettier
+                        $header = strtolower(substr($key,5));
+
+                        // Transforming dashes into spaces, and uppercasing
+                        // every first letter.
+                        $header = ucwords(str_replace('_', ' ', $header));
+
+                        // Turning spaces into dashes.
+                        $header = str_replace(' ', '-', $header);
+                        $headers[$header] = $value;
+
+                    }
+                    break;
+
+
+            }
+
+        }
+
+        $r = new Request($method, $url, $headers);
+        $r->setHttpVersion($httpVersion);
+        $r->setRawServerData($serverArray);
+        $r->setAbsoluteUrl($protocol . '://' . $hostName . $url);
+        return $r;
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/lib/URLUtil.php Added

@@ -0,0 +1,218 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * URL utility class
+ *
+ * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
+ *
+ * It was not possible to use PHP's built-in methods for this, because some clients don't like
+ * encoding of certain characters.
+ *
+ * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
+ * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
+ * kept as-is.
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class URLUtil {
+
+    /**
+     * Encodes the path of a url.
+     *
+     * slashes (/) are treated as path-separators.
+     *
+     * @param string $path
+     * @return string
+     */
+    static function encodePath($path) {
+
+        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\/:@])/',function($match) {
+
+            return '%'.sprintf('%02x',ord($match[0]));
+
+        }, $path);
+
+    }
+
+    /**
+     * Encodes a 1 segment of a path
+     *
+     * Slashes are considered part of the name, and are encoded as %2f
+     *
+     * @param string $pathSegment
+     * @return string
+     */
+    static function encodePathSegment($pathSegment) {
+
+        return preg_replace_callback('/([^A-Za-z0-9_\-\.~:@])/',function($match) {
+
+            return '%'.sprintf('%02x',ord($match[0]));
+
+        }, $pathSegment);
+    }
+
+    /**
+     * Decodes a url-encoded path
+     *
+     * @param string $path
+     * @return string
+     */
+    static function decodePath($path) {
+
+        return self::decodePathSegment($path);
+
+    }
+
+    /**
+     * Decodes a url-encoded path segment
+     *
+     * @param string $path
+     * @return string
+     */
+    static function decodePathSegment($path) {
+
+        $path = rawurldecode($path);
+        $encoding = mb_detect_encoding($path, ['UTF-8','ISO-8859-1']);
+
+        switch($encoding) {
+
+            case 'ISO-8859-1' :
+                $path = utf8_encode($path);
+
+        }
+
+        return $path;
+
+    }
+
+    /**
+     * Returns the 'dirname' and 'basename' for a path.
+     *
+     * The reason there is a custom function for this purpose, is because
+     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
+     * and we need a method that just operates on UTF-8 characters.
+     *
+     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
+     * directory separator on windows.
+     *
+     * This method returns the 2 components as an array.
+     *
+     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
+     * string is stripped off.
+     *
+     * @param string $path
+     * @return array
+     */
+    static function splitPath($path) {
+
+        $matches = [];
+        if(preg_match('/^(?:(.*)\/+)?([^\/]+)\/?$/u',$path,$matches)) {
+            return [$matches[1], $matches[2]];
+        } else {
+            return [null, null];
+        }
+
+    }
+
+    /**
+     * Resolves relative urls, like a browser would.
+     *
+     * This function takes a basePath, which itself _may_ also be relative, and
+     * then applies the relative path on top of it.
+     *
+     * @param string $basePath
+     * @param string $newPath
+     * @return string
+     */
+    static function resolve($basePath, $newPath) {
+
+        $base = parse_url($basePath);
+        $delta = parse_url($newPath);
+
+        $pick = function($part) use ($base, $delta) {
+
+            if (isset($delta[$part])) {
+                return $delta[$part];
+            } elseif (isset($base[$part])) {
+                return $base[$part];
+            } else {
+                return null;
+            }
+
+        };
+
+        $url = '';
+        $scheme = $pick('scheme');
+        $host = $pick('host');
+
+        if ($scheme) {
+            // If there's a scheme, there's also a host.
+            $url=$scheme.'://' . $host;
+        } elseif (!$scheme && $host) {
+            // No scheme, but there is a host.
+            $url = '//' . $host;
+        }
+
+        $port = $pick('port');
+        if ($port) {
+            // tcp port.
+            $url.=':' . $port;
+        }
+
+        $path = '';
+        if (isset($delta['path'])) {
+            // If the path starts with a slash
+            if ($delta['path'][0]==='/') {
+                $path = $delta['path'];
+            } else {
+                // Removing last component from base path.
+                $path = $base['path'];
+                if (strpos($path, '/')!==false) {
+                    $path = substr($path,0,strrpos($path,'/'));
+                }
+                $path.='/' . $delta['path'];
+            }
+        } else {
+            $path = isset($base['path'])?$base['path']:'/';
+        }
+        // Removing .. and .
+        $pathParts = explode('/', $path);
+        $newPathParts = [];
+        foreach($pathParts as $pathPart) {
+
+            switch($pathPart) {
+                case '' :
+                case '.' :
+                    break;
+                case '..' :
+                    array_pop($newPathParts);
+                    break;
+                default :
+                    $newPathParts[] = $pathPart;
+                    break;
+            }
+        }
+

sabre-http-3.0.5.tar.gz/lib/Util.php Added

@@ -0,0 +1,266 @@
+<?php
+
+namespace Sabre\HTTP;
+
+/**
+ * HTTP utility methods
+ *
+ * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @author Paul Voegler
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Util {
+
+    /**
+     * Parses a RFC2616-compatible date string
+     *
+     * This method returns false if the date is invalid
+     *
+     * @param string $dateHeader
+     * @return bool|DateTime
+     */
+    static function parseHTTPDate($dateHeader) {
+
+        //RFC 2616 section 3.3.1 Full Date
+        //Only the format is checked, valid ranges are checked by strtotime below
+        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
+        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
+        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
+        $time = '([0-1]\d|2[0-3])(\:[0-5]\d){2}';
+        $date3 = $month . ' ([12]\d|3[01]| [1-9])';
+        $date2 = '(0[1-9]|[12]\d|3[01])\-' . $month . '\-\d{2}';
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $date1 = '(0[1-9]|[12]\d|3[01]) ' . $month . ' [1-9]\d{3}';
+
+        //ANSI C's asctime() format
+        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
+        $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
+        //RFC 850, obsoleted by RFC 1036
+        $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
+        //RFC 822, updated by RFC 1123
+        $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
+        //allowed date formats by RFC 2616
+        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
+
+        //allow for space around the string and strip it
+        $dateHeader = trim($dateHeader, ' ');
+        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
+            return false;
+
+        //append implicit GMT timezone to ANSI C time format
+        if (strpos($dateHeader, ' GMT') === false)
+            $dateHeader .= ' GMT';
+
+
+        $realDate = strtotime($dateHeader);
+        //strtotime can return -1 or false in case of error
+        if ($realDate !== false && $realDate >= 0)
+            return new \DateTime('@' . $realDate, new \DateTimeZone('UTC'));
+
+    }
+
+    /**
+     * Transforms a DateTime object to HTTP's most common date format.
+     *
+     * We're serializing it as the RFC 1123 date, which, for HTTP must be
+     * specified as GMT.
+     *
+     * @param \DateTime $dateTime
+     * @return string
+     */
+    static function toHTTPDate(\DateTime $dateTime) {
+
+        // We need to clone it, as we don't want to affect the existing
+        // DateTime.
+        $dateTime = clone $dateTime;
+        $dateTime->setTimeZone(new \DateTimeZone('GMT'));
+        return $dateTime->format('D, d M Y H:i:s \G\M\T');
+
+    }
+
+    /**
+     * This method can be used to aid with content negotiation.
+     *
+     * It takes 2 arguments, the $acceptHeaderValue, which usually comes from
+     * an Accept header, and $availableOptions, which contains an array of
+     * items that the server can support.
+     *
+     * The result of this function will be the 'best possible option'. If no
+     * best possible option could be found, null is returned.
+     *
+     * When it's null you can according to the spec either return a default, or
+     * you can choose to emit 406 Not Acceptable.
+     *
+     * The method also accepts sending 'null' for the $acceptHeaderValue,
+     * implying that no accept header was sent.
+     *
+     * @param string|null $acceptHeaderValue
+     * @param array $availableOptions
+     * @return string|null
+     */
+    static function negotiateContentType($acceptHeaderValue, array $availableOptions) {
+
+        if (!$acceptHeaderValue) {
+            // Grabbing the first in the list.
+            return reset($availableOptions);
+        }
+
+        $proposals = array_map(
+            ['self', 'parseMimeType'],
+            explode(',', $acceptHeaderValue)
+        );
+
+        // Ensuring array keys are reset.
+        $availableOptions = array_values($availableOptions);
+
+        $options = array_map(
+            ['self', 'parseMimeType'],
+            $availableOptions
+        );
+
+        $lastQuality = 0;
+        $lastSpecificity = 0;
+        $lastOptionIndex = 0;
+        $lastChoice = null;
+
+        foreach($proposals as $proposal) {
+
+            // Ignoring broken values.
+            if (is_null($proposal)) continue;
+
+            // If the quality is lower we don't have to bother comparing.
+            if ($proposal['quality'] < $lastQuality) {
+                continue;
+            }
+
+            foreach($options as $optionIndex => $option) {
+
+                if ($proposal['type'] !== '*' && $proposal['type'] !== $option['type']) {
+                    // no match on type.
+                    continue;
+                }
+                if ($proposal['subType'] !== '*' && $proposal['subType'] !== $option['subType']) {
+                    // no match on subtype.
+                    continue;
+                }
+
+                // Any parameters appearing on the options must appear on
+                // proposals.
+                foreach($option['parameters'] as $paramName => $paramValue) {
+                    if (!array_key_exists($paramName, $proposal['parameters'])) {
+                        continue 2;
+                    }
+                    if ($paramValue !== $proposal['parameters'][$paramName]) {
+                        continue 2;
+                    }
+                }
+
+                // If we got here, we have a match on parameters, type and
+                // subtype. We need to calculate a score for how specific the
+                // match was.
+                $specificity =
+                    ($proposal['type']!=='*'?20:0) +
+                    ($proposal['subType']!=='*'?10:0) +
+                    count($option['parameters']);
+
+
+                // Does this entry win?
+                if (
+                    ($proposal['quality'] > $lastQuality) ||
+                    ($proposal['quality'] === $lastQuality && $specificity > $lastSpecificity) ||
+                    ($proposal['quality'] === $lastQuality && $specificity === $lastSpecificity && $optionIndex < $lastOptionIndex)
+                ) {
+
+                    $lastQuality = $proposal['quality'];
+                    $lastSpecificity = $specificity;
+                    $lastOptionIndex = $optionIndex;
+                    $lastChoice = $availableOptions[$optionIndex];
+
+                }
+
+            }
+
+        }
+
+        return $lastChoice;
+
+    }
+
+    /**
+     * Parses a mime-type and splits it into:
+     *
+     * 1. type
+     * 2. subtype
+     * 3. quality
+     * 4. parameters
+     *
+     * @param string $str
+     * @return array

sabre-http-3.0.5.tar.gz/lib/Version.php Added

sabre-http-3.0.5.tar.gz/tests/HTTP Added

sabre-http-3.0.5.tar.gz/tests/HTTP/Auth Added

sabre-http-3.0.5.tar.gz/tests/HTTP/Auth/AWSTest.php Changed

sabre-http-3.0.5.tar.gz/tests/HTTP/Auth/BasicTest.php Changed

sabre-http-3.0.5.tar.gz/tests/HTTP/Auth/DigestTest.php Added

@@ -0,0 +1,192 @@
+<?php
+
+namespace Sabre\HTTP\Auth;
+
+use
+    Sabre\HTTP\Request,
+    Sabre\HTTP\Response;
+
+class DigestTest extends \PHPUnit_Framework_TestCase {
+
+    /**
+     * @var Sabre\HTTP\Response
+     */
+    private $response;
+
+    /**
+     * request
+     *
+     * @var Sabre\HTTP\Request
+     */
+    private $request;
+
+    /**
+     * @var Sabre\HTTP\Auth\Digest
+     */
+    private $auth;
+
+    const REALM = 'SabreDAV unittest';
+
+    public function setUp() {
+
+        $this->response = new Response();
+        $this->request = new Request();
+        $this->auth = new Digest(self::REALM, $this->request, $this->response);
+
+
+    }
+
+    public function testDigest() {
+
+        list($nonce,$opaque) = $this->getServerTokens();
+
+        $username = 'admin';
+        $password = 12345;
+        $nc = '00002';
+        $cnonce = uniqid();
+
+        $digestHash = md5(
+            md5($username . ':' . self::REALM . ':' . $password) . ':' .
+            $nonce . ':' .
+            $nc . ':' .
+            $cnonce . ':' .
+            'auth:' .
+            md5('GET' . ':' . '/')
+        );
+
+        $this->request->setMethod('GET');
+        $this->request->setHeader('Authorization','Digest username="'.$username.'", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth,nc='.$nc.',cnonce="' . $cnonce . '"');
+
+        $this->auth->init();
+
+        $this->assertEquals($username,$this->auth->getUserName());
+        $this->assertEquals(self::REALM,$this->auth->getRealm());
+        $this->assertTrue($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . $password)),'Authentication is deemed invalid through validateA1');
+        $this->assertTrue($this->auth->validatePassword($password),'Authentication is deemed invalid through validatePassword');
+
+    }
+
+    public function testInvalidDigest() {
+
+        list($nonce,$opaque) = $this->getServerTokens();
+
+        $username = 'admin';
+        $password = 12345;
+        $nc = '00002';
+        $cnonce = uniqid();
+
+        $digestHash = md5(
+            md5($username . ':' . self::REALM . ':' . $password) . ':' .
+            $nonce . ':' .
+            $nc . ':' .
+            $cnonce . ':' .
+            'auth:' .
+            md5('GET' . ':' . '/')
+        );
+
+        $this->request->setMethod('GET');
+        $this->request->setHeader('Authorization', 'Digest username="'.$username.'", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth,nc='.$nc.',cnonce="' . $cnonce . '"');
+
+        $this->auth->init();
+
+        $this->assertFalse($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . ($password . 'randomness'))),'Authentication is deemed invalid through validateA1');
+
+    }
+
+    public function testInvalidDigest2() {
+
+        $this->request->setMethod('GET');
+        $this->request->setHeader('Authorization','basic blablabla');
+
+        $this->auth->init();
+        $this->assertFalse($this->auth->validateA1(md5('user:realm:password')));
+
+    }
+
+
+    public function testDigestAuthInt() {
+
+        $this->auth->setQOP(Digest::QOP_AUTHINT);
+        list($nonce,$opaque) = $this->getServerTokens(Digest::QOP_AUTHINT);
+
+        $username = 'admin';
+        $password = 12345;
+        $nc = '00003';
+        $cnonce = uniqid();
+
+        $digestHash = md5(
+            md5($username . ':' . self::REALM . ':' . $password) . ':' .
+            $nonce . ':' .
+            $nc . ':' .
+            $cnonce . ':' .
+            'auth-int:' .
+            md5('POST' . ':' . '/' . ':' . md5('body'))
+        );
+
+        $this->request->setMethod('POST');
+        $this->request->setHeader('Authorization','Digest username="'.$username.'", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth-int,nc='.$nc.',cnonce="' . $cnonce . '"');
+        $this->request->setBody('body');
+
+        $this->auth->init();
+
+        $this->assertTrue($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . $password)),'Authentication is deemed invalid through validateA1');
+
+    }
+
+    public function testDigestAuthBoth() {
+
+        $this->auth->setQOP(Digest::QOP_AUTHINT | Digest::QOP_AUTH);
+        list($nonce,$opaque) = $this->getServerTokens(Digest::QOP_AUTHINT| Digest::QOP_AUTH);
+
+        $username = 'admin';
+        $password = 12345;
+        $nc = '00003';
+        $cnonce = uniqid();
+
+        $digestHash = md5(
+            md5($username . ':' . self::REALM . ':' . $password) . ':' .
+            $nonce . ':' .
+            $nc . ':' .
+            $cnonce . ':' .
+            'auth-int:' .
+            md5('POST' . ':' . '/' . ':' . md5('body'))
+        );
+
+        $this->request->setMethod('POST');
+        $this->request->setHeader('Authorization','Digest username="'.$username.'", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth-int,nc='.$nc.',cnonce="' . $cnonce . '"');
+        $this->request->setBody('body');
+
+        $this->auth->init();
+
+        $this->assertTrue($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . $password)),'Authentication is deemed invalid through validateA1');
+
+    }
+
+
+    private function getServerTokens($qop = Digest::QOP_AUTH) {
+
+        $this->auth->requireLogin();
+
+        switch($qop) {
+            case Digest::QOP_AUTH    : $qopstr='auth'; break;
+            case Digest::QOP_AUTHINT : $qopstr='auth-int'; break;
+            default                                 : $qopstr='auth,auth-int'; break;
+        }
+
+        $test = preg_match('/Digest realm="'.self::REALM.'",qop="'.$qopstr.'",nonce="([0-9a-f]*)",opaque="([0-9a-f]*)"/',
+            $this->response->getHeader('WWW-Authenticate'),$matches);
+
+        $this->assertTrue($test==true,'The WWW-Authenticate response didn\'t match our pattern. We received: ' . $this->response->getHeader('WWW-Authenticate'));
+
+        $nonce = $matches[1];
+        $opaque = $matches[2];
+
+        // Reset our environment
+        $this->setUp();
+        $this->auth->setQOP($qop);
+
+        return array($nonce,$opaque);
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/tests/HTTP/ClientTest.php Added

@@ -0,0 +1,471 @@
+<?php
+
+namespace Sabre\HTTP;
+
+class ClientTest extends \PHPUnit_Framework_TestCase {
+
+    protected $client;
+
+    function testCreateCurlSettingsArrayGET() {
+
+        $client = new ClientMock();
+        $client->addCurlSetting(CURLOPT_POSTREDIR, 0);
+
+        $request = new Request('GET','http://example.org/', ['X-Foo' => 'bar']);
+
+        $settings = [
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_HEADER => true,
+                CURLOPT_POSTREDIR => 0,
+                CURLOPT_HTTPHEADER => ['X-Foo: bar'],
+                CURLOPT_NOBODY => false,
+                CURLOPT_URL => 'http://example.org/',
+                CURLOPT_CUSTOMREQUEST => 'GET',
+                CURLOPT_POSTFIELDS => null,
+                CURLOPT_PUT => false,
+            ];
+
+        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
+        // at least if this unit test fails in the future we know it is :)
+        if(defined('HHVM_VERSION') === false) {
+            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+        }
+
+
+        $this->assertEquals($settings, $client->createCurlSettingsArray($request));
+
+    }
+
+    function testCreateCurlSettingsArrayHEAD() {
+
+        $client = new ClientMock();
+        $request = new Request('HEAD','http://example.org/', ['X-Foo' => 'bar']);
+
+
+        $settings = [
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_HEADER => true,
+                CURLOPT_NOBODY => true,
+                CURLOPT_CUSTOMREQUEST => 'HEAD',
+                CURLOPT_HTTPHEADER => ['X-Foo: bar'],
+                CURLOPT_URL => 'http://example.org/',
+                CURLOPT_POSTFIELDS => '',
+                CURLOPT_PUT => false,
+            ];
+
+        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
+        // at least if this unit test fails in the future we know it is :)
+        if(defined('HHVM_VERSION') === false) {
+            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+        }
+
+        $this->assertEquals($settings, $client->createCurlSettingsArray($request));
+
+    }
+
+    function testCreateCurlSettingsArrayGETAfterHEAD() {
+
+        $client = new ClientMock();
+        $request = new Request('HEAD','http://example.org/', ['X-Foo' => 'bar']);
+
+        // Parsing the settings for this method, and discarding the result.
+        // This will cause the client to automatically persist previous
+        // settings and will help us detect problems.
+        $client->createCurlSettingsArray($request);
+
+        // This is the real request.
+        $request = new Request('GET','http://example.org/', ['X-Foo' => 'bar']);
+
+        $settings = [
+                CURLOPT_CUSTOMREQUEST => 'GET',
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_HEADER => true,
+                CURLOPT_HTTPHEADER => ['X-Foo: bar'],
+                CURLOPT_NOBODY => false,
+                CURLOPT_URL => 'http://example.org/',
+                CURLOPT_POSTFIELDS => '',
+                CURLOPT_PUT => false,
+            ];
+
+        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
+        // at least if this unit test fails in the future we know it is :)
+        if(defined('HHVM_VERSION') === false) {
+            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+        }
+
+        $this->assertEquals($settings, $client->createCurlSettingsArray($request));
+
+    }
+
+    function testCreateCurlSettingsArrayPUTStream() {
+
+        $client = new ClientMock();
+
+        $h = fopen('php://memory', 'r+');
+        fwrite($h, 'booh');
+        $request = new Request('PUT','http://example.org/', ['X-Foo' => 'bar'], $h);
+
+        $settings = [
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_HEADER => true,
+                CURLOPT_PUT => true,
+                CURLOPT_INFILE => $h,
+                CURLOPT_NOBODY => false,
+                CURLOPT_CUSTOMREQUEST => 'PUT',
+                CURLOPT_HTTPHEADER => ['X-Foo: bar'],
+                CURLOPT_URL => 'http://example.org/',
+            ];
+
+        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
+        // at least if this unit test fails in the future we know it is :)
+        if(defined('HHVM_VERSION') === false) {
+            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+        }
+
+        $this->assertEquals($settings, $client->createCurlSettingsArray($request));
+
+    }
+
+    function testCreateCurlSettingsArrayPUTString() {
+
+        $client = new ClientMock();
+        $request = new Request('PUT','http://example.org/', ['X-Foo' => 'bar'], 'boo');
+
+        $settings = [
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_HEADER => true,
+                CURLOPT_NOBODY => false,
+                CURLOPT_POSTFIELDS => 'boo',
+                CURLOPT_CUSTOMREQUEST => 'PUT',
+                CURLOPT_HTTPHEADER => ['X-Foo: bar'],
+                CURLOPT_URL => 'http://example.org/',
+            ];
+
+        // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
+        // at least if this unit test fails in the future we know it is :)
+        if(defined('HHVM_VERSION') === false) {
+            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+        }
+
+        $this->assertEquals($settings, $client->createCurlSettingsArray($request));
+
+    }
+
+    function testSend() {
+
+        $client = new ClientMock();
+        $request = new Request('GET', 'http://example.org/');
+
+        $client->on('doRequest', function($request, &$response) {
+            $response = new Response(200);
+        });
+
+        $response = $client->send($request);
+
+        $this->assertEquals(200, $response->getStatus());
+
+    }
+
+    function testSendClientError() {
+
+        $client = new ClientMock();
+        $request = new Request('GET', 'http://example.org/');
+
+        $client->on('doRequest', function($request, &$response) {
+            throw new ClientException('aaah',1);
+        });
+        $called = false;
+        $client->on('exception', function() use (&$called) {
+            $called = true;
+        });
+
+        try {
+            $client->send($request);
+            $this->fail('send() should have thrown an exception');
+        } catch (ClientException $e) {
+
+        }
+        $this->assertTrue($called);
+
+    }
+
+    function testSendHttpError() {
+
+        $client = new ClientMock();

sabre-http-3.0.5.tar.gz/tests/HTTP/MessageDecoratorTest.php Added

@@ -0,0 +1,90 @@
+<?php
+
+namespace Sabre\HTTP;
+
+class MessageDecoratorTest extends \PHPUnit_Framework_TestCase {
+
+    protected $inner;
+    protected $outer;
+
+    function setUp() {
+
+        $this->inner = new Request();
+        $this->outer = new RequestDecorator($this->inner);
+
+    }
+
+    function testBody() {
+
+        $this->outer->setBody('foo');
+        $this->assertEquals('foo', stream_get_contents($this->inner->getBodyAsStream()));
+        $this->assertEquals('foo', stream_get_contents($this->outer->getBodyAsStream()));
+        $this->assertEquals('foo', $this->inner->getBodyAsString());
+        $this->assertEquals('foo', $this->outer->getBodyAsString());
+        $this->assertEquals('foo', $this->inner->getBody());
+        $this->assertEquals('foo', $this->outer->getBody());
+
+    }
+
+    function testHeaders() {
+
+        $this->outer->setHeaders([
+            'a' => 'b',
+            ]);
+
+        $this->assertEquals(['a' => ['b']], $this->inner->getHeaders());
+        $this->assertEquals(['a' => ['b']], $this->outer->getHeaders());
+
+        $this->outer->setHeaders([
+            'c' => 'd',
+        ]);
+
+        $this->assertEquals(['a' => ['b'], 'c' => ['d']], $this->inner->getHeaders());
+        $this->assertEquals(['a' => ['b'], 'c' => ['d']], $this->outer->getHeaders());
+
+        $this->outer->addHeaders([
+            'e' => 'f',
+            ]);
+
+        $this->assertEquals(['a' => ['b'], 'c' => ['d'], 'e' => ['f']], $this->inner->getHeaders());
+        $this->assertEquals(['a' => ['b'], 'c' => ['d'], 'e' => ['f']], $this->outer->getHeaders());
+    }
+
+    function testHeader() {
+
+        $this->assertFalse($this->outer->hasHeader('a'));
+        $this->assertFalse($this->inner->hasHeader('a'));
+        $this->outer->setHeader('a', 'c');
+        $this->assertTrue($this->outer->hasHeader('a'));
+        $this->assertTrue($this->inner->hasHeader('a'));
+
+        $this->assertEquals('c', $this->inner->getHeader('A'));
+        $this->assertEquals('c', $this->outer->getHeader('A'));
+
+        $this->outer->addHeader('A','d');
+
+        $this->assertEquals(
+            ['c','d'],
+            $this->inner->getHeaderAsArray('A')
+        );
+        $this->assertEquals(
+            ['c','d'],
+            $this->outer->getHeaderAsArray('A')
+        );
+
+        $this->outer->removeHeader('a');
+
+        $this->assertNull($this->inner->getHeader('A'));
+        $this->assertNull($this->outer->getHeader('A'));
+    }
+
+    function testHttpVersion() {
+
+        $this->outer->setHttpVersion('1.0');
+
+        $this->assertEquals('1.0', $this->inner->getHttpVersion());
+        $this->assertEquals('1.0', $this->outer->getHttpVersion());
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/tests/HTTP/MessageTest.php Added

@@ -0,0 +1,197 @@
+<?php
+
+namespace Sabre\HTTP;
+
+class MessageTest extends \PHPUnit_Framework_TestCase {
+
+    function testConstruct() {
+
+        $message = new MessageMock();
+        $this->assertInstanceOf('Sabre\HTTP\Message', $message);
+
+    }
+
+    function testStreamBody() {
+
+        $body = 'foo';
+        $h = fopen('php://memory', 'r+');
+        fwrite($h, $body);
+        rewind($h);
+
+        $message = new MessageMock();
+        $message->setBody($h);
+
+        $this->assertEquals($body, $message->getBodyAsString());
+        rewind($h);
+        $this->assertEquals($body, stream_get_contents($message->getBodyAsStream()));
+        rewind($h);
+        $this->assertEquals($body, stream_get_contents($message->getBody()));
+
+    }
+
+    function testStringBody() {
+
+        $body = 'foo';
+
+        $message = new MessageMock();
+        $message->setBody($body);
+
+        $this->assertEquals($body, $message->getBodyAsString());
+        $this->assertEquals($body, stream_get_contents($message->getBodyAsStream()));
+        $this->assertEquals($body, $message->getBody());
+
+    }
+
+
+    function testGetEmptyBodyStream() {
+
+        $message = new MessageMock();
+        $body = $message->getBodyAsStream();
+
+        $this->assertEquals('', stream_get_contents($body));
+
+    }
+
+    function testGetEmptyBodyString() {
+
+        $message = new MessageMock();
+        $body = $message->getBodyAsString();
+
+        $this->assertEquals('', $body);
+
+    }
+
+    function testHeaders() {
+
+        $message = new MessageMock();
+        $message->setHeader('X-Foo', 'bar');
+
+        // Testing caselessness
+        $this->assertEquals('bar', $message->getHeader('X-Foo'));
+        $this->assertEquals('bar', $message->getHeader('x-fOO'));
+
+        $this->assertTrue(
+            $message->removeHeader('X-FOO')
+        );
+        $this->assertNull($message->getHeader('X-Foo'));
+        $this->assertFalse(
+            $message->removeHeader('X-FOO')
+        );
+
+    }
+
+    function testSetHeaders() {
+
+        $message = new MessageMock();
+
+        $headers = [
+            'X-Foo' => ['1'],
+            'X-Bar' => ['2'],
+        ];
+
+        $message->setHeaders($headers);
+        $this->assertEquals($headers, $message->getHeaders());
+
+        $message->setHeaders([
+            'X-Foo' => ['3','4'],
+            'X-Bar' => '5',
+        ]);
+
+        $expected = [
+            'X-Foo' => ['3','4'],
+            'X-Bar' => ['5'],
+        ];
+
+        $this->assertEquals($expected, $message->getHeaders());
+
+    }
+
+    function testAddHeaders() {
+
+        $message = new MessageMock();
+
+        $headers = [
+            'X-Foo' => ['1'],
+            'X-Bar' => ['2'],
+        ];
+
+        $message->addHeaders($headers);
+        $this->assertEquals($headers, $message->getHeaders());
+
+        $message->addHeaders([
+            'X-Foo' => ['3','4'],
+            'X-Bar' => '5',
+        ]);
+
+        $expected = [
+            'X-Foo' => ['1','3','4'],
+            'X-Bar' => ['2','5'],
+        ];
+
+        $this->assertEquals($expected, $message->getHeaders());
+
+    }
+
+    function testSendBody() {
+
+        $message = new MessageMock();
+
+        // String
+        $message->setBody('foo');
+
+        // Stream
+        $h = fopen('php://memory','r+');
+        fwrite($h,'bar');
+        rewind($h);
+        $message->setBody($h);
+
+        $body = $message->getBody();
+        rewind($body);
+
+        $this->assertEquals('bar', stream_get_contents($body));
+
+    }
+
+    function testMultipleHeaders() {
+
+        $message = new MessageMock();
+        $message->setHeader('a', '1');
+        $message->addHeader('A', '2');
+
+        $this->assertEquals(
+            "1,2",
+            $message->getHeader('A')
+        );
+        $this->assertEquals(
+            "1,2",
+            $message->getHeader('a')
+        );
+
+        $this->assertEquals(
+            ['1','2'],
+            $message->getHeaderAsArray('a')
+        );
+        $this->assertEquals(
+            ['1','2'],
+            $message->getHeaderAsArray('A')
+        );
+        $this->assertEquals(
+            [],
+            $message->getHeaderAsArray('B')
+        );
+
+    }
+
+    function testHasHeaders() {
+
+        $message = new MessageMock();
+
+        $this->assertFalse($message->hasHeader('X-Foo'));
+        $message->setHeader('X-Foo', 'Bar');
+        $this->assertTrue($message->hasHeader('X-Foo'));
+
+    }
+
+}
+
+class MessageMock extends Message { }

sabre-http-3.0.5.tar.gz/tests/HTTP/RequestDecoratorTest.php Changed

sabre-http-3.0.5.tar.gz/tests/HTTP/RequestTest.php Added

@@ -0,0 +1,167 @@
+<?php
+
+namespace Sabre\HTTP;
+
+class RequestTest extends \PHPUnit_Framework_TestCase {
+
+    function testConstruct() {
+
+        $request = new Request('GET', '/foo', array(
+            'User-Agent' => 'Evert',
+        ));
+        $this->assertEquals('GET', $request->getMethod());
+        $this->assertEquals('/foo', $request->getUrl());
+        $this->assertEquals(array(
+            'User-Agent' => ['Evert'],
+        ), $request->getHeaders());
+
+    }
+
+    function testGetQueryParameters() {
+
+        $request = new Request('GET', '/foo?a=b&c&d=e');
+        $this->assertEquals([
+            'a' => 'b',
+            'c' => null,
+            'd' => 'e',
+        ], $request->getQueryParameters());
+
+    }
+
+    function testGetQueryParametersNoData() {
+
+        $request = new Request('GET', '/foo');
+        $this->assertEquals([], $request->getQueryParameters());
+
+    }
+
+    /**
+     * @backupGlobals
+     */
+    function testCreateFromPHPRequest() {
+
+        $_SERVER['REQUEST_METHOD'] = 'PUT';
+
+        $request = Sapi::getRequest();
+        $this->assertEquals('PUT', $request->getMethod());
+
+    }
+
+    function testGetAbsoluteUrl() {
+
+        $s = [
+            'HTTP_HOST' => 'sabredav.org',
+            'REQUEST_URI' => '/foo'
+        ];
+
+        $r = Sapi::createFromServerArray($s);
+
+        $this->assertEquals('http://sabredav.org/foo', $r->getAbsoluteUrl());
+
+        $s = [
+            'HTTP_HOST'   => 'sabredav.org',
+            'REQUEST_URI' => '/foo',
+            'HTTPS'       => 'on',
+        ];
+
+        $r = Sapi::createFromServerArray($s);
+
+        $this->assertEquals('https://sabredav.org/foo', $r->getAbsoluteUrl());
+
+    }
+
+    function testGetPostData() {
+
+        $post = [
+            'bla' => 'foo',
+        ];
+        $r = new Request();
+        $r->setPostData($post);
+        $this->assertEquals($post, $r->getPostData());
+
+    }
+
+    function testGetPath() {
+
+        $request = new Request();
+        $request->setBaseUrl('/foo');
+        $request->setUrl('/foo/bar/');
+
+        $this->assertEquals('bar', $request->getPath());
+
+    }
+
+    function testGetPathStrippedQuery() {
+
+        $request = new Request();
+        $request->setBaseUrl('/foo');
+        $request->setUrl('/foo/bar/?a=b');
+
+        $this->assertEquals('bar', $request->getPath());
+
+    }
+
+    function testGetPathMissingSlash() {
+
+        $request = new Request();
+        $request->setBaseUrl('/foo/');
+        $request->setUrl('/foo');
+
+        $this->assertEquals('', $request->getPath());
+
+    }
+
+    /**
+     * @expectedException \LogicException
+     */
+    function testGetPathOutsideBaseUrl() {
+
+        $request = new Request();
+        $request->setBaseUrl('/foo/');
+        $request->setUrl('/bar/');
+
+        $request->getPath();
+
+    }
+
+    function testToString() {
+
+        $request = new Request('PUT', '/foo/bar', ['Content-Type' => 'text/xml']);
+        $request->setBody('foo');
+
+        $expected = <<<HI
+PUT /foo/bar HTTP/1.1\r
+Content-Type: text/xml\r
+\r
+foo
+HI;
+        $this->assertEquals($expected, (string)$request);
+
+    }
+
+    function testToStringAuthorization() {
+
+        $request = new Request('PUT', '/foo/bar', ['Content-Type' => 'text/xml', 'Authorization' => 'Basic foobar']);
+        $request->setBody('foo');
+
+        $expected = <<<HI
+PUT /foo/bar HTTP/1.1\r
+Content-Type: text/xml\r
+Authorization: Basic REDACTED\r
+\r
+foo
+HI;
+        $this->assertEquals($expected, (string)$request);
+
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    function testConstructorWithArray() {
+
+        $request = new Request(array());
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/tests/HTTP/ResponseDecoratorTest.php Changed

sabre-http-3.0.5.tar.gz/tests/HTTP/ResponseTest.php Changed

sabre-http-3.0.5.tar.gz/tests/HTTP/SapiTest.php Added

@@ -0,0 +1,120 @@
+<?php
+
+namespace Sabre\HTTP;
+
+class SapiTest extends \PHPUnit_Framework_TestCase {
+
+    function testConstructFromServerArray() {
+
+        $request = Sapi::createFromServerArray(array(
+            'REQUEST_URI'     => '/foo',
+            'REQUEST_METHOD'  => 'GET',
+            'HTTP_USER_AGENT' => 'Evert',
+            'CONTENT_TYPE'    => 'text/xml',
+            'CONTENT_LENGTH'  => '400',
+            'SERVER_PROTOCOL' => 'HTTP/1.0',
+        ));
+
+        $this->assertEquals('GET', $request->getMethod());
+        $this->assertEquals('/foo', $request->getUrl());
+        $this->assertEquals(array(
+            'User-Agent' => ['Evert'],
+            'Content-Type' => ['text/xml'],
+            'Content-Length' => ['400'],
+        ), $request->getHeaders());
+
+        $this->assertEquals('1.0', $request->getHttpVersion());
+
+        $this->assertEquals('400', $request->getRawServerValue('CONTENT_LENGTH'));
+        $this->assertNull($request->getRawServerValue('FOO'));
+
+    }
+
+    function testConstructPHPAuth() {
+
+        $request = Sapi::createFromServerArray(array(
+            'REQUEST_URI'     => '/foo',
+            'REQUEST_METHOD'  => 'GET',
+            'PHP_AUTH_USER'   => 'user',
+            'PHP_AUTH_PW'     => 'pass',
+        ));
+
+        $this->assertEquals('GET', $request->getMethod());
+        $this->assertEquals('/foo', $request->getUrl());
+        $this->assertEquals(array(
+            'Authorization' => ['Basic ' . base64_encode('user:pass')],
+        ), $request->getHeaders());
+
+    }
+
+    function testConstructPHPAuthDigest() {
+
+        $request = Sapi::createFromServerArray(array(
+            'REQUEST_URI'     => '/foo',
+            'REQUEST_METHOD'  => 'GET',
+            'PHP_AUTH_DIGEST' => 'blabla',
+        ));
+
+        $this->assertEquals('GET', $request->getMethod());
+        $this->assertEquals('/foo', $request->getUrl());
+        $this->assertEquals(array(
+            'Authorization' => ['Digest blabla'],
+        ), $request->getHeaders());
+
+    }
+
+    function testConstructRedirectAuth() {
+
+        $request = Sapi::createFromServerArray(array(
+            'REQUEST_URI'                 => '/foo',
+            'REQUEST_METHOD'              => 'GET',
+            'REDIRECT_HTTP_AUTHORIZATION' => 'Basic bla',
+        ));
+
+        $this->assertEquals('GET', $request->getMethod());
+        $this->assertEquals('/foo', $request->getUrl());
+        $this->assertEquals(array(
+            'Authorization' => ['Basic bla'],
+        ), $request->getHeaders());
+
+    }
+
+    /**
+     * @runInSeparateProcess
+     *
+     * Unfortunately we have no way of testing if the HTTP response code got
+     * changed.
+     */
+    function testSend() {
+
+        if (!function_exists('xdebug_get_headers')) {
+            $this->markTestSkipped('XDebug needs to be installed for this test to run');
+        }
+
+        $response = new Response(204, ['Content-Type' => 'text/xml;charset=UTF-8']);
+
+        // Second Content-Type header. Normally this doesn't make sense.
+        $response->addHeader('Content-Type', 'application/xml');
+        $response->setBody('foo');
+
+        ob_start();
+
+        Sapi::sendResponse($response);
+        $headers = xdebug_get_headers();
+
+        $result = ob_get_clean();
+        header_remove();
+
+        $this->assertEquals(
+            [
+                "Content-Type: text/xml;charset=UTF-8",
+                "Content-Type: application/xml",
+            ],
+            $headers
+        );
+
+        $this->assertEquals('foo', $result);
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/tests/HTTP/URLUtilTest.php Added

@@ -0,0 +1,193 @@
+<?php
+
+namespace Sabre\HTTP;
+
+class URLUtilTest extends \PHPUnit_Framework_TestCase{
+
+    function testEncodePath() {
+
+        $str = '';
+        for($i=0;$i<128;$i++) $str.=chr($i);
+
+        $newStr = URLUtil::encodePath($str);
+
+        $this->assertEquals(
+            '%00%01%02%03%04%05%06%07%08%09%0a%0b%0c%0d%0e%0f'.
+            '%10%11%12%13%14%15%16%17%18%19%1a%1b%1c%1d%1e%1f'.
+            '%20%21%22%23%24%25%26%27()%2a%2b%2c-./'.
+            '0123456789:%3b%3c%3d%3e%3f'.
+            '@ABCDEFGHIJKLMNO' .
+            'PQRSTUVWXYZ%5b%5c%5d%5e_' .
+            '%60abcdefghijklmno' .
+            'pqrstuvwxyz%7b%7c%7d~%7f',
+            $newStr);
+
+        $this->assertEquals($str,URLUtil::decodePath($newStr));
+
+    }
+
+    function testEncodePathSegment() {
+
+        $str = '';
+        for($i=0;$i<128;$i++) $str.=chr($i);
+
+        $newStr = URLUtil::encodePathSegment($str);
+
+        // Note: almost exactly the same as the last test, with the
+        // exception of the encoding of / (ascii code 2f)
+        $this->assertEquals(
+            '%00%01%02%03%04%05%06%07%08%09%0a%0b%0c%0d%0e%0f'.
+            '%10%11%12%13%14%15%16%17%18%19%1a%1b%1c%1d%1e%1f'.
+            '%20%21%22%23%24%25%26%27()%2a%2b%2c-.%2f'.
+            '0123456789:%3b%3c%3d%3e%3f'.
+            '@ABCDEFGHIJKLMNO' .
+            'PQRSTUVWXYZ%5b%5c%5d%5e_' .
+            '%60abcdefghijklmno' .
+            'pqrstuvwxyz%7b%7c%7d~%7f',
+            $newStr);
+
+        $this->assertEquals($str,URLUtil::decodePathSegment($newStr));
+
+    }
+
+    function testDecode() {
+
+        $str = 'Hello%20Test+Test2.txt';
+        $newStr = URLUtil::decodePath($str);
+        $this->assertEquals('Hello Test+Test2.txt',$newStr);
+
+    }
+
+    /**
+     * @depends testDecode
+     */
+    function testDecodeUmlaut() {
+
+        $str = 'Hello%C3%BC.txt';
+        $newStr = URLUtil::decodePath($str);
+        $this->assertEquals("Hello\xC3\xBC.txt",$newStr);
+
+    }
+
+    /**
+     * @depends testDecodeUmlaut
+     */
+    function testDecodeUmlautLatin1() {
+
+        $str = 'Hello%FC.txt';
+        $newStr = URLUtil::decodePath($str);
+        $this->assertEquals("Hello\xC3\xBC.txt",$newStr);
+
+    }
+
+    /**
+     * This testcase was sent by a bug reporter
+     *
+     * @depends testDecode
+     */
+    function testDecodeAccentsWindows7() {
+
+        $str = '/webdav/%C3%A0fo%C3%B3';
+        $newStr = URLUtil::decodePath($str);
+        $this->assertEquals(strtolower($str),URLUtil::encodePath($newStr));
+
+    }
+
+    function testSplitPath() {
+
+        $strings = array(
+
+            // input                    // expected result
+            '/foo/bar'                 => array('/foo','bar'),
+            '/foo/bar/'                => array('/foo','bar'),
+            'foo/bar/'                 => array('foo','bar'),
+            'foo/bar'                  => array('foo','bar'),
+            'foo/bar/baz'              => array('foo/bar','baz'),
+            'foo/bar/baz/'             => array('foo/bar','baz'),
+            'foo'                      => array('','foo'),
+            'foo/'                     => array('','foo'),
+            '/foo/'                    => array('','foo'),
+            '/foo'                     => array('','foo'),
+            ''                         => array(null,null),
+
+            // UTF-8
+            "/\xC3\xA0fo\xC3\xB3/bar"  => array("/\xC3\xA0fo\xC3\xB3",'bar'),
+            "/\xC3\xA0foo/b\xC3\xBCr/" => array("/\xC3\xA0foo","b\xC3\xBCr"),
+            "foo/\xC3\xA0\xC3\xBCr"    => array("foo","\xC3\xA0\xC3\xBCr"),
+
+        );
+
+        foreach($strings as $input => $expected) {
+
+            $output = URLUtil::splitPath($input);
+            $this->assertEquals($expected, $output, 'The expected output for \'' . $input . '\' was incorrect');
+
+
+        }
+
+    }
+
+    /**
+     * @dataProvider resolveData
+     */
+    function testResolve($base, $update, $expected) {
+
+        $this->assertEquals(
+            $expected,
+            URLUtil::resolve($base, $update)
+        );
+
+    }
+
+    function resolveData() {
+
+        return [
+            [
+                'http://example.org/foo/baz',
+                '/bar',
+                'http://example.org/bar',
+            ],
+            [
+                'https://example.org/foo',
+                '//example.net/',
+                'https://example.net/',
+            ],
+            [
+                'https://example.org/foo',
+                '?a=b',
+                'https://example.org/foo?a=b',
+            ],
+            [
+                '//example.org/foo',
+                '?a=b',
+                '//example.org/foo?a=b',
+            ],
+            // Ports and fragments
+            [
+                'https://example.org:81/foo#hey',
+                '?a=b#c=d',
+                'https://example.org:81/foo?a=b#c=d',
+            ],
+            // Relative.. in-directory paths
+            [
+                'http://example.org/foo/bar',
+                'bar2',
+                'http://example.org/foo/bar2',
+            ],
+            // Now the base path ended with a slash
+            [
+                'http://example.org/foo/bar/',
+                'bar2/bar3',
+                'http://example.org/foo/bar/bar2/bar3',
+            ],
+            // .. and .
+            [
+                'http://example.org/foo/bar/',
+                '../bar2/.././/bar3/',
+                'http://example.org/foo/bar3/',
+            ],
+        ];
+
+    }
+
+}

sabre-http-3.0.5.tar.gz/tests/HTTP/UtilTest.php Added

@@ -0,0 +1,219 @@
+<?php
+
+namespace Sabre\HTTP;
+
+class UtilTest extends \PHPUnit_Framework_TestCase {
+
+    function testParseHTTPDate() {
+
+        $times = array(
+            'Wed, 13 Oct 2010 10:26:00 GMT',
+            'Wednesday, 13-Oct-10 10:26:00 GMT',
+            'Wed Oct 13 10:26:00 2010',
+        );
+
+        $expected = 1286965560;
+
+        foreach($times as $time) {
+            $result = Util::parseHTTPDate($time);
+            $this->assertEquals($expected, $result->format('U'));
+        }
+
+        $result = Util::parseHTTPDate('Wed Oct  6 10:26:00 2010');
+        $this->assertEquals(1286360760, $result->format('U'));
+
+    }
+
+    function testParseHTTPDateFail() {
+
+        $times = array(
+            //random string
+            'NOW',
+            // not-GMT timezone
+            'Wednesday, 13-Oct-10 10:26:00 UTC',
+            // No space before the 6
+            'Wed Oct 6 10:26:00 2010',
+            // Invalid day
+            'Wed Oct  0 10:26:00 2010',
+            'Wed Oct 32 10:26:00 2010',
+            'Wed, 0 Oct 2010 10:26:00 GMT',
+            'Wed, 32 Oct 2010 10:26:00 GMT',
+            'Wednesday, 32-Oct-10 10:26:00 GMT',
+            // Invalid hour
+            'Wed, 13 Oct 2010 24:26:00 GMT',
+            'Wednesday, 13-Oct-10 24:26:00 GMT',
+            'Wed Oct 13 24:26:00 2010',
+        );
+
+        foreach($times as $time) {
+            $this->assertFalse(Util::parseHTTPDate($time), 'We used the string: ' . $time);
+        }
+
+    }
+
+    function testTimezones() {
+
+        $default = date_default_timezone_get();
+        date_default_timezone_set('Europe/Amsterdam');
+
+        $this->testParseHTTPDate();
+
+        date_default_timezone_set($default);
+
+    }
+
+    function testToHTTPDate() {
+
+        $dt = new \DateTime('2011-12-10 12:00:00 +0200');
+
+        $this->assertEquals(
+            'Sat, 10 Dec 2011 10:00:00 GMT',
+            Util::toHTTPDate($dt)
+        );
+
+    }
+
+    function testStrtotimeFail() {
+
+        // Strtotime may return -1 when the date cannot be parsed.
+        // We are simulating this situation by testing a date that actually
+        // results in -1. (because I have found no other way to break this
+        // code)
+
+        $time = 'Wed, 13 Oct 1960 10:26:00 GMT';
+
+        $this->assertNull(Util::parseHTTPDate($time));
+
+    }
+
+    /**
+     * @dataProvider negotiateData
+     */
+    function testNegotiate($acceptHeader, $available, $expected) {
+
+        $this->assertEquals(
+            $expected,
+            Util::negotiate($acceptHeader, $available)
+        );
+
+    }
+
+    function negotiateData() {
+
+        return [
+            [ // simple
+                'application/xml',
+                ['application/xml'],
+                'application/xml',
+            ],
+            [ // no header
+                null,
+                ['application/xml'],
+                'application/xml',
+            ],
+            [ // 2 options
+                'application/json',
+                ['application/xml', 'application/json'],
+                'application/json',
+            ],
+            [ // 2 choices
+                'application/json, application/xml',
+                ['application/xml'],
+                'application/xml',
+            ],
+            [ // quality
+                'application/xml;q=0.2, application/json',
+                ['application/xml', 'application/json'],
+                'application/json',
+            ],
+            [ // wildcard
+                'image/jpeg, image/png, */*',
+                ['application/xml', 'application/json'],
+                'application/xml',
+            ],
+            [ // wildcard + quality
+                'image/jpeg, image/png; q=0.5, */*',
+                ['application/xml', 'application/json', 'image/png'],
+                'application/xml',
+            ],
+            [ // no match
+                'image/jpeg',
+                ['application/xml'],
+                null,
+            ],
+            [ // This is used in sabre/dav
+                'text/vcard; version=4.0',
+                [
+                    // Most often used mime-type. Version 3
+                    'text/x-vcard',
+                    // The correct standard mime-type. Defaults to version 3 as
+                    // well.
+                    'text/vcard',
+                    // vCard 4
+                    'text/vcard; version=4.0',
+                    // vCard 3
+                    'text/vcard; version=3.0',
+                    // jCard
+                    'application/vcard+json',
+                ],
+                'text/vcard; version=4.0',
+
+            ],
+            [ // rfc7231 example 1
+                'audio/*; q=0.2, audio/basic',
+                [
+                    'audio/pcm',
+                    'audio/basic',
+                ],
+                'audio/basic',
+            ],
+            [ // Lower quality after
+                'audio/pcm; q=0.2, audio/basic; q=0.1',
+                [
+                    'audio/pcm',
+                    'audio/basic',
+                ],
+                'audio/pcm',
+            ],
+            [ // Random parameter, should be ignored
+                'audio/pcm; hello; q=0.2, audio/basic; q=0.1',
+                [
+                    'audio/pcm',
+                    'audio/basic',
+                ],
+                'audio/pcm',
+            ],
+            [ // No whitepace after type, should pick the one that is the most specific.
+                'text/vcard;version=3.0, text/vcard',
+                [
+                    'text/vcard',
+                    'text/vcard; version=3.0'
+                ],
+                'text/vcard; version=3.0',
+            ],
+            [ // Same as last one, but order is different
+                'text/vcard, text/vcard;version=3.0',
+                [
+                    'text/vcard; version=3.0',
+                    'text/vcard',
+                ],

sabre-http-2.0.4.tar.gz/tests/bootstrap.php -> sabre-http-3.0.5.tar.gz/tests/bootstrap.php Changed

sabre-http-2.0.4.tar.gz/tests/phpunit.xml -> sabre-http-3.0.5.tar.gz/tests/phpunit.xml Changed