Merge c4f6159 into 256b4eb

pillarjs · May 20, 2018 · 083707c · 083707c
2 parents 256b4eb + c4f6159
commit 083707c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -65,11 +65,12 @@ Cookies.prototype.get = function(name, opts) {
   value = match[1]
   if (!opts || !signed) return value
 
+  if (!this.keys) throw new Error('.keys required for signed cookies');
+
   remote = this.get(sigName)
   if (!remote) return
 
   data = name + "=" + value
-  if (!this.keys) throw new Error('.keys required for signed cookies');
   index = this.keys.index(data, remote)
 
   if (index < 0) {
@@ -162,7 +163,7 @@ Cookie.prototype.toString = function() {
 Cookie.prototype.toHeader = function() {
   var header = this.toString()
 
-  if (this.maxAge) this.expires = new Date(Date.now() + this.maxAge);
+  if (this.maxAge || 0 === this.maxAge) this.expires = new Date(Date.now() + this.maxAge);
 
   if (this.path     ) header += "; path=" + this.path
   if (this.expires  ) header += "; expires=" + this.expires.toUTCString()