Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Commit c2f9414

Browse files
ezimuelezimuel
committed
Merged from zf2/master
42 parents da76193 + 515476d + 26e6cb2 + 0772403 + e0b6d8c + 4620d34 + 128c4da + 92f5c68 + c7d790d + 2549b87 + 47be447 + b60e5b4 + 328746d + 29a4a76 + ef5ed67 + 76e4ea4 + 70330aa + 10f278f + 252fdc8 + 023de10 + 85fcc7b + 5d8866f + 634bb62 + 453bb28 + c8dba7b + f7017f6 + 6979e44 + d1673d5 + 5a530d5 + c10ba52 + eb5e8ac + 1377bc0 + f548f30 + e9e4fec + 367be36 + bcbdf6c + da3d16c + d997a89 + 22ab842 + 82c6dd5 + d0e7648 + 752a5af commit c2f9414

File tree

112 files changed

+1714
-991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1714
-991
lines changed

‎src/Client.php‎

Lines changed: 150 additions & 127 deletions
Large diffs are not rendered by default.

‎src/Client/Adapter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Http
1717
* @subpackage Client_Adapter
18-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
*/
2121

@@ -33,7 +33,7 @@
3333
* @category Zend
3434
* @package Zend_Http
3535
* @subpackage Client_Adapter
36-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
36+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3737
* @license http://framework.zend.com/license/new-bsd New BSD License
3838
*/
3939
interface Adapter

‎src/Client/Adapter/Curl.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @category Zend
1717
* @package Zend_Http
1818
* @subpackage Client_Adapter
19-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
19+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
2020
* @license http://framework.zend.com/license/new-bsd New BSD License
2121
*/
2222

@@ -36,7 +36,7 @@
3636
* @category Zend
3737
* @package Zend_Http
3838
* @subpackage Client_Adapter
39-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
39+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
4040
* @license http://framework.zend.com/license/new-bsd New BSD License
4141
*/
4242
class Curl implements HttpAdapter, Stream
@@ -365,7 +365,11 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
365365

366366
// set additional headers
367367
$headers['Accept'] = '';
368-
curl_setopt($this->curl, CURLOPT_HTTPHEADER, $headers);
368+
$curlHeaders = array();
369+
foreach ($headers as $key => $value) {
370+
$curlHeaders[] = $key . ': ' . $value;
371+
}
372+
curl_setopt($this->curl, CURLOPT_HTTPHEADER, $curlHeaders);
369373

370374
/**
371375
* Make sure POSTFIELDS is set after $curlMethod is set:

‎src/Client/Adapter/Exception.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Http
1717
* @subpackage Client_Adapter_Exception
18-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
*/
2121

@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Http
3131
* @subpackage Client_Adapter
32-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
interface Exception extends \Zend\Http\Client\Exception

‎src/Client/Adapter/Exception/InitializationException.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Http
17-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
32-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
class InitializationException

‎src/Client/Adapter/Exception/InvalidArgumentException.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Http
17-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
32-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
class InvalidArgumentException

‎src/Client/Adapter/Exception/OutOfRangeException.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Http
17-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
32-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
class OutOfRangeException

‎src/Client/Adapter/Exception/RuntimeException.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Http
17-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
32-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
class RuntimeException

‎src/Client/Adapter/Exception/TimeoutException.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Zend
1616
* @package Zend_Http
17-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
17+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1818
* @license http://framework.zend.com/license/new-bsd New BSD License
1919
* @version $Id$
2020
*/
@@ -29,7 +29,7 @@
2929
* @category Zend
3030
* @package Zend_Application
3131
* @uses \Zend\Http\Client\Adapter\Exception
32-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
32+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
3333
* @license http://framework.zend.com/license/new-bsd New BSD License
3434
*/
3535
class TimeoutException

‎src/Client/Adapter/Proxy.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @category Zend
1616
* @package Zend_Http
1717
* @subpackage Client_Adapter
18-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
18+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
*/
2121

@@ -38,7 +38,7 @@
3838
* @category Zend
3939
* @package Zend_Http
4040
* @subpackage Client_Adapter
41-
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
41+
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
4242
* @license http://framework.zend.com/license/new-bsd New BSD License
4343
*/
4444
class Proxy extends Socket

0 commit comments

Comments
 (0)