Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 8bd57d3a79a7 · 2022-08-17T17:20:44.000+02:00
* 6.0:
  Fix merge
diff --git a/Tests/Fixtures/response-functional/deleted_cookie.expected b/Tests/Fixtures/response-functional/deleted_cookie.expected
@@ -6,6 +6,6 @@ Array
     [2] => Cache-Control: max-age=0, must-revalidate, private
     [3] => Date: Sat, 12 Nov 1955 20:04:00 GMT
     [4] => Expires: %s, %d %s %d %d:%d:%d GMT
-    [5] => Set-Cookie: PHPSESSID=deleted; expires=%s, %d-%s-%d %d:%d:%d GMT; Max-Age=%d; %s
+    [5] => Set-Cookie: PHPSESSID=deleted; expires=%s, %d %s %d %d:%d:%d GMT; Max-Age=%d; %s
 )
 shutdown

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ Array`
`6`	`6`	`[2] => Cache-Control: max-age=0, must-revalidate, private`
`7`	`7`	`[3] => Date: Sat, 12 Nov 1955 20:04:00 GMT`
`8`	`8`	`[4] => Expires: %s, %d %s %d %d:%d:%d GMT`
`9`		`- [5] => Set-Cookie: PHPSESSID=deleted; expires=%s, %d-%s-%d %d:%d:%d GMT; Max-Age=%d; %s`
	`9`	`+ [5] => Set-Cookie: PHPSESSID=deleted; expires=%s, %d %s %d %d:%d:%d GMT; Max-Age=%d; %s`
`10`	`10`	`)`
`11`	`11`	`shutdown`