Mercurial > emacs
changeset 110341:827513405247
* lisp/url/url-cookie.el (url-cookie-expired-p): Tweak previous change.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 08 Sep 2010 22:38:43 -0700 |
| parents | 885a9b44898e |
| children | ba563485f83b |
| files | lisp/url/ChangeLog lisp/url/url-cookie.el |
| diffstat | 2 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/url/ChangeLog Wed Sep 08 22:36:13 2010 -0700 +++ b/lisp/url/ChangeLog Wed Sep 08 22:38:43 2010 -0700 @@ -1,3 +1,7 @@ +2010-09-09 Glenn Morris <rgm@gnu.org> + + * url-cookie.el (url-cookie-expired-p): Tweak previous change. + 2010-09-09 shawn boles <shawn.boles@gmail.com> (tiny change) * url-cookie.el (url-cookie-expired-p): Simplify and fix. (Bug#6957)
--- a/lisp/url/url-cookie.el Wed Sep 08 22:36:13 2010 -0700 +++ b/lisp/url/url-cookie.el Wed Sep 08 22:38:43 2010 -0700 @@ -1,7 +1,7 @@ ;;; url-cookie.el --- Netscape Cookie support -;; Copyright (C) 1996, 1997, 1998, 1999, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia @@ -193,12 +193,9 @@ (setq url-cookie-storage (list (list domain tmp)))))))) (defun url-cookie-expired-p (cookie) - "Returns true if COOKIE is expired. -If COOKIE has an expiration date it is converted to seconds, adjusted to the client timezone and then compared against (float-time)." - (let* ((exp (url-cookie-expires cookie)) - (exp-time (and exp (float-time (date-to-time exp))))) - (if (not exp) nil (> (float-time) exp-time))) - ) + "Return non-nil if COOKIE is expired." + (let ((exp (url-cookie-expires cookie))) + (and exp (> (float-time) (float-time (date-to-time exp)))))) (defun url-cookie-retrieve (host &optional localpart secure) "Retrieve all the netscape-style cookies for a specified HOST and LOCALPART."