[tomcat] 01/06: Don't include a cookie header in push request when there are no cookies

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 70a9a31060d0e71c10c41f11053a343e4d63bd43
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 14 19:20:04 2022 +0000

    Don't include a cookie header in push request when there are no cookies
---
 java/org/apache/catalina/core/ApplicationPushBuilder.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationPushBuilder.java 
b/java/org/apache/catalina/core/ApplicationPushBuilder.java
index 57e62bc..9037e9c 100644
--- a/java/org/apache/catalina/core/ApplicationPushBuilder.java
+++ b/java/org/apache/catalina/core/ApplicationPushBuilder.java
@@ -157,10 +157,12 @@ public class ApplicationPushBuilder {
                 cookies.add(new Cookie(responseCookie.getName(), 
responseCookie.getValue()));
             }
         }
-        List<String> cookieValues = new ArrayList<>(1);
-        cookieValues.add(generateCookieHeader(cookies,
-                catalinaRequest.getContext().getCookieProcessor()));
-        headers.put("cookie", cookieValues);
+        if (cookies.size() > 0) {
+            List<String> cookieValues = new ArrayList<>(1);
+            cookieValues.add(generateCookieHeader(cookies,
+                    catalinaRequest.getContext().getCookieProcessor()));
+            headers.put("cookie", cookieValues);
+        }
 
         // Authentication
         if (catalinaRequest.getPrincipal() != null) {

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org