Mercurial > emacs
changeset 101179:84cbdd182a6d
(url-cookie-retrieve): Handle null localpart.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 14 Jan 2009 20:47:02 +0000 |
| parents | f068978fa9ab |
| children | 2b60f03f682b |
| files | lisp/url/url-cookie.el |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/url/url-cookie.el Wed Jan 14 20:46:23 2009 +0000 +++ b/lisp/url/url-cookie.el Wed Jan 14 20:47:02 2009 +0000 @@ -223,7 +223,7 @@ (* 1 (string-to-number (aref exp-time 0)))))) (> (- cur-norm exp-norm) 1)))))) -(defun url-cookie-retrieve (host localpart &optional secure) +(defun url-cookie-retrieve (host &optional localpart secure) "Retrieve all the netscape-style cookies for a specified HOST and LOCALPART." (let ((storage (if secure (append url-cookie-secure-storage url-cookie-storage) @@ -232,7 +232,7 @@ (cookies nil) (cur nil) (retval nil) - (localpart-regexp nil)) + (localpart-match nil)) (while storage (setq cur (car storage) storage (cdr storage) @@ -251,9 +251,10 @@ (while cookies (setq cur (car cookies) cookies (cdr cookies) - localpart-regexp (concat "^" (regexp-quote - (url-cookie-localpart cur)))) - (if (and (string-match localpart-regexp localpart) + localpart-match (let ((lp (url-cookie-localpart cur))) + (when lp + (concat "^" (regexp-quote lp))))) + (if (and (equal localpart localpart-match) (not (url-cookie-expired-p cur))) (setq retval (cons cur retval)))))) retval))