commit 676240b7eebd11c7592c069f6426c65a7cb8138d
author Brian Demers <bdemers@apache.org> Sat Oct 17 11:01:06 2020 -0400
committer GitHub <noreply@github.com> Sat Oct 17 11:01:06 2020 -0400
tree dbc52268bad04f8062e30f7822afee891e8b7057
parent b9973cbf8346f6b04bf1f5197ad91215c9d4e2a5
parent e384ebaaa0a283cb3009435c37a25f0b452776eb

Merge pull request #259 from apache/tls-for-its-16x

Update AbstractContainerIT to allow for HTTPS connections      Using a pre-generated keystore (1.6.x)

web/src/main/java/org/apache/shiro/web/servlet/SimpleCookie.java

diff --git a/web/src/main/java/org/apache/shiro/web/servlet/SimpleCookie.java b/web/src/main/java/org/apache/shiro/web/servlet/SimpleCookie.java
index d28405c..b385ed5 100644
--- a/web/src/main/java/org/apache/shiro/web/servlet/SimpleCookie.java
+++ b/web/src/main/java/org/apache/shiro/web/servlet/SimpleCookie.java
@@ -398,7 +398,7 @@
         int version = getVersion();
         boolean secure = isSecure();
         boolean httpOnly = false; //no need to add the extra text, plus the value 'deleteMe' is not sensitive at all
-        SameSiteOptions sameSite = null;
+        SameSiteOptions sameSite = getSameSite();
 
         addCookieHeader(response, name, value, comment, domain, path, maxAge, version, secure, httpOnly, sameSite);