diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-01-14 20:47:02 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-01-14 20:47:02 +0000 |
| commit | 033535ded7581d7184e4c1b030cabfcf93bad8fd (patch) | |
| tree | c9b509696a28d67ac1966d8e8bde73328f5e89b1 | |
| parent | 26343c7f0ea071f41a6f6608751faf1fad9b3fe0 (diff) | |
| download | emacs-033535ded7581d7184e4c1b030cabfcf93bad8fd.tar.gz | |
(url-cookie-retrieve): Handle null localpart.
| -rw-r--r-- | lisp/url/url-cookie.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index 5641d3d9624..9a9c4671332 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -223,7 +223,7 @@ telling Microsoft that." (* 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 @@ telling Microsoft that." (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 @@ telling Microsoft that." (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)) |