diff options
author | robocoder <anthon.pang@gmail.com> | 2010-01-29 12:02:30 +0300 |
---|---|---|
committer | robocoder <anthon.pang@gmail.com> | 2010-01-29 12:02:30 +0300 |
commit | 1378f79297baa84590738839ec11cef90ac21bc4 (patch) | |
tree | 61b8272e59891a9d5d175d8a883a978fd913daf0 /libs/Zend/Http | |
parent | f156256d1f2537e6e448c7b8b5852d59a0e9099e (diff) |
update wrt Zend Framework 1.10.0; remove svn:eol-style property
git-svn-id: http://dev.piwik.org/svn/trunk@1813 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'libs/Zend/Http')
-rw-r--r-- | libs/Zend/Http/Client.php | 11 | ||||
-rw-r--r-- | libs/Zend/Http/Client/Adapter/Curl.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Client/Adapter/Exception.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Client/Adapter/Interface.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Client/Adapter/Proxy.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Client/Adapter/Socket.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Client/Adapter/Stream.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Client/Adapter/Test.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Client/Exception.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Cookie.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/CookieJar.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Exception.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Response.php | 6 | ||||
-rw-r--r-- | libs/Zend/Http/Response/Stream.php | 113 |
14 files changed, 98 insertions, 98 deletions
diff --git a/libs/Zend/Http/Client.php b/libs/Zend/Http/Client.php index c7f396ce2d..1e58946573 100644 --- a/libs/Zend/Http/Client.php +++ b/libs/Zend/Http/Client.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client - * @version $Id: Client.php 19309 2009-11-30 11:03:01Z bate $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -60,7 +60,7 @@ require_once 'Zend/Http/Response/Stream.php'; * @package Zend_Http * @subpackage Client * @throws Zend_Http_Client_Exception - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client @@ -75,7 +75,8 @@ class Zend_Http_Client const DELETE = 'DELETE'; const TRACE = 'TRACE'; const OPTIONS = 'OPTIONS'; - const CONNECT = 'CONNECT'; + const CONNECT = 'CONNECT';
+ const MERGE = 'MERGE'; /** * Supported HTTP Authentication methods @@ -842,7 +843,7 @@ class Zend_Http_Client } catch (Zend_Exception $e) { /** @see Zend_Http_Client_Exception */ require_once 'Zend/Http/Client/Exception.php'; - throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}"); + throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}", 0, $e); } } diff --git a/libs/Zend/Http/Client/Adapter/Curl.php b/libs/Zend/Http/Client/Adapter/Curl.php index 6a4bee15da..79e78e77f4 100644 --- a/libs/Zend/Http/Client/Adapter/Curl.php +++ b/libs/Zend/Http/Client/Adapter/Curl.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Curl.php 19309 2009-11-30 11:03:01Z bate $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Curl.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -42,7 +42,7 @@ require_once 'Zend/Http/Client/Adapter/Stream.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream diff --git a/libs/Zend/Http/Client/Adapter/Exception.php b/libs/Zend/Http/Client/Adapter/Exception.php index b157e0facf..c744c54abb 100644 --- a/libs/Zend/Http/Client/Adapter/Exception.php +++ b/libs/Zend/Http/Client/Adapter/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter_Exception - * @version $Id: Exception.php 17118 2009-07-26 09:41:41Z shahar $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Http/Client/Exception.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Exception extends Zend_Http_Client_Exception diff --git a/libs/Zend/Http/Client/Adapter/Interface.php b/libs/Zend/Http/Client/Adapter/Interface.php index 46b84accbf..be9d187947 100644 --- a/libs/Zend/Http/Client/Adapter/Interface.php +++ b/libs/Zend/Http/Client/Adapter/Interface.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Interface.php 16214 2009-06-21 19:34:03Z thomas $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_Client_Adapter_Interface diff --git a/libs/Zend/Http/Client/Adapter/Proxy.php b/libs/Zend/Http/Client/Adapter/Proxy.php index 932b1b66b6..d8c90dcd22 100644 --- a/libs/Zend/Http/Client/Adapter/Proxy.php +++ b/libs/Zend/Http/Client/Adapter/Proxy.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Proxy.php 17118 2009-07-26 09:41:41Z shahar $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Proxy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,7 +46,7 @@ require_once 'Zend/Http/Client/Adapter/Socket.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket diff --git a/libs/Zend/Http/Client/Adapter/Socket.php b/libs/Zend/Http/Client/Adapter/Socket.php index 51e453b3b1..2e6813ce49 100644 --- a/libs/Zend/Http/Client/Adapter/Socket.php +++ b/libs/Zend/Http/Client/Adapter/Socket.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Socket.php 19309 2009-11-30 11:03:01Z bate $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Socket.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,7 +41,7 @@ require_once 'Zend/Http/Client/Adapter/Stream.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream diff --git a/libs/Zend/Http/Client/Adapter/Stream.php b/libs/Zend/Http/Client/Adapter/Stream.php index 7e0df1284c..58dd921f20 100644 --- a/libs/Zend/Http/Client/Adapter/Stream.php +++ b/libs/Zend/Http/Client/Adapter/Stream.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Stream.php 19309 2009-11-30 11:03:01Z bate $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Interface.php 16214 2009-06-21 19:34:03Z thomas $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_Client_Adapter_Stream diff --git a/libs/Zend/Http/Client/Adapter/Test.php b/libs/Zend/Http/Client/Adapter/Test.php index 5d2838633c..82e9f04118 100644 --- a/libs/Zend/Http/Client/Adapter/Test.php +++ b/libs/Zend/Http/Client/Adapter/Test.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Test.php 19309 2009-11-30 11:03:01Z bate $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Test.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -44,7 +44,7 @@ require_once 'Zend/Http/Client/Adapter/Interface.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interface diff --git a/libs/Zend/Http/Client/Exception.php b/libs/Zend/Http/Client/Exception.php index 6d5efdf27e..8d47dcbff6 100644 --- a/libs/Zend/Http/Client/Exception.php +++ b/libs/Zend/Http/Client/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Exception - * @version $Id: Exception.php 16872 2009-07-20 11:47:08Z mikaelkael $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Http/Exception.php'; * @category Zend * @package Zend_Http * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Exception extends Zend_Http_Exception diff --git a/libs/Zend/Http/Cookie.php b/libs/Zend/Http/Cookie.php index d8e278898a..498d25f418 100644 --- a/libs/Zend/Http/Cookie.php +++ b/libs/Zend/Http/Cookie.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Cookie - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Cookie.php 17124 2009-07-26 09:46:42Z shahar $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Cookie.php 20096 2010-01-06 02:05:09Z bkarwin $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,7 +41,7 @@ require_once 'Zend/Uri/Http.php'; * * @category Zend * @package Zend_Http - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Cookie diff --git a/libs/Zend/Http/CookieJar.php b/libs/Zend/Http/CookieJar.php index 59afdfbd52..9253479cf0 100644 --- a/libs/Zend/Http/CookieJar.php +++ b/libs/Zend/Http/CookieJar.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage CookieJar - * @version $Id: CookieJar.php 17124 2009-07-26 09:46:42Z shahar $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: CookieJar.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -54,7 +54,7 @@ require_once "Zend/Http/Response.php"; * @category Zend * @package Zend_Http * @subpackage CookieJar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_CookieJar implements Countable, IteratorAggregate diff --git a/libs/Zend/Http/Exception.php b/libs/Zend/Http/Exception.php index 93a3869153..099dfde48b 100644 --- a/libs/Zend/Http/Exception.php +++ b/libs/Zend/Http/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Exception - * @version $Id: Exception.php 16872 2009-07-20 11:47:08Z mikaelkael $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; * @category Zend * @package Zend_Http * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Exception extends Zend_Exception diff --git a/libs/Zend/Http/Response.php b/libs/Zend/Http/Response.php index 9db70f4e25..b4d8847ba2 100644 --- a/libs/Zend/Http/Response.php +++ b/libs/Zend/Http/Response.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Response - * @version $Id: Response.php 17124 2009-07-26 09:46:42Z shahar $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Http * @subpackage Response - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Response diff --git a/libs/Zend/Http/Response/Stream.php b/libs/Zend/Http/Response/Stream.php index 0dea34d2f4..667ca321ab 100644 --- a/libs/Zend/Http/Response/Stream.php +++ b/libs/Zend/Http/Response/Stream.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Response - * @version $Id: Stream.php 19309 2009-11-30 11:03:01Z bate $ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Response.php 17131 2009-07-26 10:03:39Z shahar $ + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Http * @subpackage Response - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Response_Stream extends Zend_Http_Response @@ -39,23 +39,23 @@ class Zend_Http_Response_Stream extends Zend_Http_Response * @var resource */ protected $stream; - + /** * The name of the file containing the stream - * + * * Will be empty if stream is not file-based. - * + * * @var string */ protected $stream_name; - /* * + /** * Should we clean up the stream file when this response is closed? - * + * * @var boolean */ protected $_cleanup; - + /** * Get the response as stream * @@ -65,7 +65,7 @@ class Zend_Http_Response_Stream extends Zend_Http_Response { return $this->stream; } - + /** * Set the response stream * @@ -78,45 +78,45 @@ class Zend_Http_Response_Stream extends Zend_Http_Response return $this; } - /** - * Get the cleanup trigger - * - * @return boolean - */
- public function getCleanup() {
- return $this->_cleanup;
- }
- - /** - * Set the cleanup trigger - * - * @param $cleanup Set cleanup trigger - */
- public function setCleanup($cleanup = true) {
- $this->_cleanup = $cleanup;
- }
+ /** + * Get the cleanup trigger + * + * @return boolean + */ + public function getCleanup() { + return $this->_cleanup; + } + + /** + * Set the cleanup trigger + * + * @param $cleanup Set cleanup trigger + */ + public function setCleanup($cleanup = true) { + $this->_cleanup = $cleanup; + } /** * Get file name associated with the stream - * - * @return string - */ - public function getStreamName() { - return $this->stream_name; - } - - /** - * Set file name associated with the stream - * - * @param string $stream_name Name to set - * @return Zend_Http_Response_Stream - */ - public function setStreamName($stream_name) { - $this->stream_name = $stream_name; - return $this; - } - - + * + * @return string + */ + public function getStreamName() { + return $this->stream_name; + } + + /** + * Set file name associated with the stream + * + * @param string $stream_name Name to set + * @return Zend_Http_Response_Stream + */ + public function setStreamName($stream_name) { + $this->stream_name = $stream_name; + return $this; + } + + /** * HTTP response constructor * @@ -136,17 +136,16 @@ class Zend_Http_Response_Stream extends Zend_Http_Response * @param string $message Response code as text * @throws Zend_Http_Exception */ - - public function __construct($code, $headers, $body = null, $version = '1.1', $message = null) + public function __construct($code, $headers, $body = null, $version = '1.1', $message = null) { - + if(is_resource($body)) { $this->setStream($body); $body = ''; } parent::__construct($code, $headers, $body, $version, $message); } - + /** * Create a new Zend_Http_Response_Stream object from a string * @@ -163,7 +162,7 @@ class Zend_Http_Response_Stream extends Zend_Http_Response return new self($code, $headers, $stream, $version, $message); } - + /** * Get the response body as string * @@ -183,7 +182,7 @@ class Zend_Http_Response_Stream extends Zend_Http_Response } return parent::getBody(); } - + /** * Get the raw response body (as transfered "on wire") as string * @@ -199,12 +198,12 @@ class Zend_Http_Response_Stream extends Zend_Http_Response } return $this->body; } - + /** * Read stream content and return it as string - * + * * Function reads the remainder of the body from the stream and closes the stream. - * + * * @return string */ protected function readStream() @@ -221,7 +220,7 @@ class Zend_Http_Response_Stream extends Zend_Http_Response fclose($this->stream); $this->stream = null; } - + public function __destruct() { if(is_resource($this->stream)) { @@ -232,5 +231,5 @@ class Zend_Http_Response_Stream extends Zend_Http_Response @unlink($this->stream_name); } } - + } |