Use undeprecated methods for adding cookies.

Also fix issue where a request with cookie headers would have the header value dropped when the request was sent.
cakephp · Mar 30, 2017 · 5034140 · 5034140
1 parent edd7109
commit 5034140
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/Http/Client.php b/src/Http/Client.php
@@ -440,6 +440,7 @@ protected function _createRequest($method, $url, $data, $options)
         }
 
         $request = new Request($url, $method, $headers, $data);
+        $request = $this->_cookies->addToRequest($request);
         $request->cookie($this->_cookies->get($url));
         if (isset($options['cookies'])) {
             $request->cookie($options['cookies']);

diff --git a/src/Http/Client/Adapter/Stream.php b/src/Http/Client/Adapter/Stream.php
@@ -147,15 +147,19 @@ protected function _buildHeaders(Request $request, $options)
     {
         $headers = [];
         foreach ($request->getHeaders() as $name => $values) {
-            $headers[] = sprintf('%s: %s', $name, implode(", ", $values));
+            if ($name !== 'Cookie') {
+                $headers[] = sprintf('%s: %s', $name, implode(", ", $values));
+            }
         }
 
+        $cookieHeader = $request->getHeaderLine('Cookie');
         $cookies = [];
         foreach ($request->cookies() as $name => $value) {
             $cookies[] = "$name=$value";
         }
-        if ($cookies) {
-            $headers[] = 'Cookie: ' . implode('; ', $cookies);
+        $cookieData = implode('; ', $cookies);
+        if ($cookieData || $cookieHeader) {
+            $headers[] = 'Cookie: ' . implode('; ', [$cookieHeader, $cookieData]);
         }
         $this->_contextOptions['header'] = implode("\r\n", $headers);
     }

diff --git a/tests/TestCase/Http/Client/Adapter/StreamTest.php b/tests/TestCase/Http/Client/Adapter/StreamTest.php
@@ -163,7 +163,8 @@ public function testBuildingContextHeader()
         $request->url('http://localhost')
             ->header([
                 'User-Agent' => 'CakePHP TestSuite',
-                'Content-Type' => 'application/json'
+                'Content-Type' => 'application/json',
+                'Cookie' => 'a=b; c=d',
             ])
             ->cookie([
                 'testing' => 'value',
@@ -179,7 +180,7 @@ public function testBuildingContextHeader()
             'Connection: close',
             'User-Agent: CakePHP TestSuite',
             'Content-Type: application/json',
-            'Cookie: testing=value; utm_src=awesome',
+            'Cookie: a=b; c=d; testing=value; utm_src=awesome',
         ];
         $this->assertEquals(implode("\r\n", $expected), $result['header']);
         $this->assertEquals($options['redirect'], $result['max_redirects']);

diff --git a/tests/TestCase/Http/ClientTest.php b/tests/TestCase/Http/ClientTest.php
@@ -611,7 +611,6 @@ public function testCookieStorage()
         $http = new Client([
             'host' => 'cakephp.org',
             'adapter' => $adapter,
-            'cookieJar' => $cookieJar
         ]);
 
         $http->get('/projects');