Fix Cookie handling as per RFC 6265 Section 5.4

gnat42 · gnat42 · commit 5815cf3f7e14 · 2018-05-08T10:58:14.000-06:00
Concatenate multiple cookies
diff --git a/src/Plugin/CookiePlugin.php b/src/Plugin/CookiePlugin.php
@@ -38,6 +38,7 @@ public function __construct(CookieJar $cookieJar)
      */
     public function handleRequest(RequestInterface $request, callable $next, callable $first)
     {
+        $cookies = [];
         foreach ($this->cookieJar->getCookies() as $cookie) {
             if ($cookie->isExpired()) {
                 continue;
@@ -55,7 +56,11 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
                 continue;
             }
 
-            $request = $request->withAddedHeader('Cookie', sprintf('%s=%s', $cookie->getName(), $cookie->getValue()));
+            $cookies[] = sprintf('%s=%s', $cookie->getName(), $cookie->getValue());
+        }
+
+        if (!empty($cookies)) {
+            $request = $request->withAddedHeader('Cookie', implode('; ', $cookies));
         }
 
         return $next($request)->then(function (ResponseInterface $response) use ($request) {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public function __construct(CookieJar $cookieJar)`
`38`	`38`	`*/`
`39`	`39`	`public function handleRequest(RequestInterface $request, callable $next, callable $first)`
`40`	`40`	`{`
	`41`	`+ $cookies = [];`
`41`	`42`	`foreach ($this->cookieJar->getCookies() as $cookie) {`
`42`	`43`	`if ($cookie->isExpired()) {`
`43`	`44`	`continue;`
`@@ -55,7 +56,11 @@ public function handleRequest(RequestInterface $request, callable $next, callabl`
`55`	`56`	`continue;`
`56`	`57`	`}`
`57`	`58`
`58`		`- $request = $request->withAddedHeader('Cookie', sprintf('%s=%s', $cookie->getName(), $cookie->getValue()));`
	`59`	`+ $cookies[] = sprintf('%s=%s', $cookie->getName(), $cookie->getValue());`
	`60`	`+ }`
	`61`	`+`
	`62`	`+ if (!empty($cookies)) {`
	`63`	`+ $request = $request->withAddedHeader('Cookie', implode('; ', $cookies));`
`59`	`64`	`}`
`60`	`65`
`61`	`66`	`return $next($request)->then(function (ResponseInterface $response) use ($request) {`