comparison lisp/url/url-cookie.el @ 111945:c00190a8c8ef

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 13 Dec 2010 10:27:36 -0500
parents 1d1ed3e3e171 3d34c0b303ff
children b5bb4bf62d4a
comparison
equal deleted inserted replaced
111884:9b5cce10c8e2 111945:c00190a8c8ef
196 "Return non-nil if COOKIE is expired." 196 "Return non-nil if COOKIE is expired."
197 (let ((exp (url-cookie-expires cookie))) 197 (let ((exp (url-cookie-expires cookie)))
198 (and exp (> (float-time) (float-time (date-to-time exp)))))) 198 (and exp (> (float-time) (float-time (date-to-time exp))))))
199 199
200 (defun url-cookie-retrieve (host &optional localpart secure) 200 (defun url-cookie-retrieve (host &optional localpart secure)
201 "Retrieve all the netscape-style cookies for a specified HOST and LOCALPART." 201 "Retrieve all cookies for a specified HOST and LOCALPART."
202 (let ((storage (if secure 202 (let ((storage (if secure
203 (append url-cookie-secure-storage url-cookie-storage) 203 (append url-cookie-secure-storage url-cookie-storage)
204 url-cookie-storage)) 204 url-cookie-storage))
205 (case-fold-search t) 205 (case-fold-search t)
206 (cookies nil) 206 (cookies nil)
224 ;; The domains match - a possible hit! 224 ;; The domains match - a possible hit!
225 (while cookies 225 (while cookies
226 (setq cur (car cookies) 226 (setq cur (car cookies)
227 cookies (cdr cookies) 227 cookies (cdr cookies)
228 localpart-match (url-cookie-localpart cur)) 228 localpart-match (url-cookie-localpart cur))
229 (if (and (if (stringp localpart-match) 229 (if (and (if (and (stringp localpart-match)
230 (stringp localpart))
230 (string-match (concat "^" (regexp-quote 231 (string-match (concat "^" (regexp-quote
231 localpart-match)) 232 localpart-match))
232 localpart) 233 localpart)
233 (equal localpart localpart-match)) 234 (equal localpart localpart-match))
234 (not (url-cookie-expired-p cur))) 235 (not (url-cookie-expired-p cur)))