diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:32:28 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:32:28 -0700 |
| commit | dcd90f60eb8952d119d97efcef9564ec96def054 (patch) | |
| tree | 2d3a5bbac64d7fbd94f3af0774218911a522e61f /lisp/url/url-http.el | |
| parent | c44ecb77ab33f0a0559c3e5da42fb486d6b014dd (diff) | |
| parent | 0ffc9cef49b0fceb3c5e904837ea5675fe4306ac (diff) | |
| download | emacs-dcd90f60eb8952d119d97efcef9564ec96def054.tar.gz | |
Merge from origin/emacs-25
0ffc9ce Update admin/authors.el
0ad7410 Update Antinews in ELisp manual
ea0f750 Fix comments on window height macros
0bbdeed Fix 'url-http-create-request' when cookies are used
0045998 Fix cross reference in frames.texi
1392894 ; * etc/DEBUG: Minor copyedits.
304a5c8 ; * etc/DEBUG: Improve documentation of getting control to GDB.
56bf7d7 Fix regexp-opt documentation (bug #17862)
803ad6f ; Fix documentation of seq-subseq
ed4530d * lisp/emacs-lisp/gv.el (gv-ref): Fix example of PLACE in doc...
88ea396 ; Spelling fixes
17197d0 Fix tags-query-replace docstring
80a7f8b Clarify documentation of precision in format specs
88a5052 Improve and clarify documentation of subprocesses
89eb09f * etc/PROBLEMS: Mention gnutls-cli 3.5.3 (Bug#24247).
# Conflicts:
# etc/PROBLEMS
# src/process.c
Diffstat (limited to 'lisp/url/url-http.el')
| -rw-r--r-- | lisp/url/url-http.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 927d0bb8d57..81bb9b4721e 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -366,9 +366,10 @@ The string is based on `url-privacy-level' and `url-user-agent'." auth ;; Cookies (when (url-use-cookies url-http-target-url) - (url-cookie-generate-header-lines - host real-fname - (equal "https" (url-type url-http-target-url)))) + (url-http--encode-string + (url-cookie-generate-header-lines + host real-fname + (equal "https" (url-type url-http-target-url))))) ;; If-modified-since (if (and (not no-cache) (member url-http-method '("GET" nil))) |