[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100025: * lisp/url/url-cookie.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100025: * lisp/url/url-cookie.el (url-cookie-expired-p): Simplify and fix. (Bug#6957) |
Date: |
Wed, 08 Sep 2010 22:36:13 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100025
author: shawn boles <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-09-08 22:36:13 -0700
message:
* lisp/url/url-cookie.el (url-cookie-expired-p): Simplify and fix. (Bug#6957)
modified:
lisp/url/ChangeLog
lisp/url/url-cookie.el
=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog 2010-07-26 13:19:32 +0000
+++ b/lisp/url/ChangeLog 2010-09-09 05:36:13 +0000
@@ -1,3 +1,7 @@
+2010-09-09 shawn boles <address@hidden> (tiny change)
+
+ * url-cookie.el (url-cookie-expired-p): Simplify and fix. (Bug#6957)
+
2010-07-26 Michael Albinus <address@hidden>
* url-http (url-http-parse-headers): Disable file name handlers at
=== modified file 'lisp/url/url-cookie.el'
--- a/lisp/url/url-cookie.el 2010-01-13 08:35:10 +0000
+++ b/lisp/url/url-cookie.el 2010-09-09 05:36:13 +0000
@@ -24,7 +24,6 @@
;;; Code:
-(require 'timezone)
(require 'url-util)
(require 'url-parse)
(eval-when-compile (require 'cl))
@@ -194,34 +193,12 @@
(setq url-cookie-storage (list (list domain tmp))))))))
(defun url-cookie-expired-p (cookie)
- (let* (
- (exp (url-cookie-expires cookie))
- (cur-date (and exp (timezone-parse-date (current-time-string))))
- (exp-date (and exp (timezone-parse-date exp)))
- (cur-greg (and cur-date (timezone-absolute-from-gregorian
- (string-to-number (aref cur-date 1))
- (string-to-number (aref cur-date 2))
- (string-to-number (aref cur-date 0)))))
- (exp-greg (and exp (timezone-absolute-from-gregorian
- (string-to-number (aref exp-date 1))
- (string-to-number (aref exp-date 2))
- (string-to-number (aref exp-date 0)))))
- (diff-in-days (and exp (- cur-greg exp-greg)))
- )
- (cond
- ((not exp) nil) ; No expiry == expires at
browser quit
- ((< diff-in-days 0) nil) ; Expires sometime after today
- ((> diff-in-days 0) t) ; Expired before today
- (t ; Expires sometime today, check
times
- (let* ((cur-time (timezone-parse-time (aref cur-date 3)))
- (exp-time (timezone-parse-time (aref exp-date 3)))
- (cur-norm (+ (* 360 (string-to-number (aref cur-time 2)))
- (* 60 (string-to-number (aref cur-time 1)))
- (* 1 (string-to-number (aref cur-time 0)))))
- (exp-norm (+ (* 360 (string-to-number (aref exp-time 2)))
- (* 60 (string-to-number (aref exp-time 1)))
- (* 1 (string-to-number (aref exp-time 0))))))
- (> (- cur-norm exp-norm) 1))))))
+ "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)))
+ )
(defun url-cookie-retrieve (host &optional localpart secure)
"Retrieve all the netscape-style cookies for a specified HOST and LOCALPART."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r100025: * lisp/url/url-cookie.el (url-cookie-expired-p): Simplify and fix. (Bug#6957),
Glenn Morris <=