comparison lisp/url/url-http.el @ 83331:efa9e4606e7e

Merged from [e-mail]--gnu-2005 (patch 83-87, 449-468) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-449 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-450 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-451 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-452 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-453 Update from CVS: lisp/subr.el (add-to-ordered-list): Doc fix. * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-454 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-455 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-456 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-457 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-458 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-459 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-460 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-461 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-462 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-463 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-464 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-465 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-466 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-467 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-468 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-83 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-84 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-85 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-86 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-87 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-371

83330:233c9974025b

			     (not proxy-obj))
			 nil
		       (let ((url-basic-auth-storage
			      'url-http-proxy-basic-auth-storage))
			 (url-get-authentication url nil 'any nil))))
	 (real-fname (if proxy-obj (url-recreate-url proxy-obj)
		       (url-filename url)))
	 (host (url-host (or proxy-obj url)))
	 (auth (if (cdr-safe (assoc "Authorization" url-request-extra-headers))
		   nil
		 (url-get-authentication (or
					  (and (boundp 'proxy-info)

    ;; allows us to elide null lines directly, at the cost of making
    ;; the layout less clear.
    (setq request
	  (concat
	   ;; The request
	   (or url-request-method "GET") " " real-fname " HTTP/" url-http-version "\r\n"
	   ;; Version of MIME we speak
	   "MIME-Version: 1.0\r\n"
	   ;; (maybe) Try to keep the connection open
	   "Connection: " (if (or proxy-obj
				  (not url-http-attempt-keepalives))

83331:efa9e4606e7e

			     (not proxy-obj))
			 nil
		       (let ((url-basic-auth-storage
			      'url-http-proxy-basic-auth-storage))
			 (url-get-authentication url nil 'any nil))))
	 (real-fname (url-filename (or proxy-obj url)))
	 (host (url-host (or proxy-obj url)))
	 (auth (if (cdr-safe (assoc "Authorization" url-request-extra-headers))
		   nil
		 (url-get-authentication (or
					  (and (boundp 'proxy-info)

    ;; allows us to elide null lines directly, at the cost of making
    ;; the layout less clear.
    (setq request
	  (concat
	   ;; The request
	   (or url-request-method "GET") " "
	   (if proxy-obj (url-recreate-url proxy-obj) real-fname)
	   " HTTP/" url-http-version "\r\n"
	   ;; Version of MIME we speak
	   "MIME-Version: 1.0\r\n"
	   ;; (maybe) Try to keep the connection open
	   "Connection: " (if (or proxy-obj
				  (not url-http-attempt-keepalives))