Skip to content

Commit 4853956

Browse files
authored
Merge pull request ESAPI#380 from mickilous/develop
Support of Cookie without maxAge set
2 parents 26911a1 + fd88267 commit 4853956

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/main/java/org/owasp/esapi/filters/SecurityWrapperResponse.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ private String createCookieHeader(String name, String value, int maxAge, String
124124
// Set-Cookie:<name>=<value>[; <name>=<value>][; expires=<date>][;
125125
// domain=<domain_name>][; path=<some_path>][; secure][;HttpOnly
126126
String header = name + "=" + value;
127-
header += "; Max-Age=" + maxAge;
127+
if (maxAge >= 0) {
128+
header += "; Max-Age=" + maxAge;
129+
}
128130
if (domain != null) {
129131
header += "; Domain=" + domain;
130132
}

src/main/java/org/owasp/esapi/reference/DefaultHTTPUtilities.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,9 @@ private String createCookieHeader(String name, String value, int maxAge, String
340340
// Set-Cookie:<name>=<value>[; <name>=<value>][; expires=<date>][;
341341
// domain=<domain_name>][; path=<some_path>][; secure][;HttpOnly]
342342
String header = name + "=" + value;
343-
header += "; Max-Age=" + maxAge;
343+
if (maxAge >= 0) {
344+
header += "; Max-Age=" + maxAge;
345+
}
344346
if (domain != null) {
345347
header += "; Domain=" + domain;
346348
}

0 commit comments

Comments
 (0)