Mercurial > emacs
comparison lisp/url/url-http.el @ 83331:efa9e4606e7e
Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-449
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-450
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-451
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-452
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-453
Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-454
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-455
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-456
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-457
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-458
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-459
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-460
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-461
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-462
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-463
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-464
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-465
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-466
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-467
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-468
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-83
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-84
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-85
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-86
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-87
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-371
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 05 Jul 2005 22:12:55 +0000 |
parents | e58cb448e07c 6a70b4f2e463 |
children | 6c13700d1c13 |
comparison
equal
deleted
inserted
replaced
83330:233c9974025b | 83331:efa9e4606e7e |
---|---|
154 (not proxy-obj)) | 154 (not proxy-obj)) |
155 nil | 155 nil |
156 (let ((url-basic-auth-storage | 156 (let ((url-basic-auth-storage |
157 'url-http-proxy-basic-auth-storage)) | 157 'url-http-proxy-basic-auth-storage)) |
158 (url-get-authentication url nil 'any nil)))) | 158 (url-get-authentication url nil 'any nil)))) |
159 (real-fname (if proxy-obj (url-recreate-url proxy-obj) | 159 (real-fname (url-filename (or proxy-obj url))) |
160 (url-filename url))) | |
161 (host (url-host (or proxy-obj url))) | 160 (host (url-host (or proxy-obj url))) |
162 (auth (if (cdr-safe (assoc "Authorization" url-request-extra-headers)) | 161 (auth (if (cdr-safe (assoc "Authorization" url-request-extra-headers)) |
163 nil | 162 nil |
164 (url-get-authentication (or | 163 (url-get-authentication (or |
165 (and (boundp 'proxy-info) | 164 (and (boundp 'proxy-info) |
198 ;; allows us to elide null lines directly, at the cost of making | 197 ;; allows us to elide null lines directly, at the cost of making |
199 ;; the layout less clear. | 198 ;; the layout less clear. |
200 (setq request | 199 (setq request |
201 (concat | 200 (concat |
202 ;; The request | 201 ;; The request |
203 (or url-request-method "GET") " " real-fname " HTTP/" url-http-version "\r\n" | 202 (or url-request-method "GET") " " |
203 (if proxy-obj (url-recreate-url proxy-obj) real-fname) | |
204 " HTTP/" url-http-version "\r\n" | |
204 ;; Version of MIME we speak | 205 ;; Version of MIME we speak |
205 "MIME-Version: 1.0\r\n" | 206 "MIME-Version: 1.0\r\n" |
206 ;; (maybe) Try to keep the connection open | 207 ;; (maybe) Try to keep the connection open |
207 "Connection: " (if (or proxy-obj | 208 "Connection: " (if (or proxy-obj |
208 (not url-http-attempt-keepalives)) | 209 (not url-http-attempt-keepalives)) |