From bd876f90953400122f0bee0beae3c2166c1f0117 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Mon, 24 Jul 2006 10:53:10 +0000 Subject: Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 118-120) - Merge from emacs--devo--0 - Update from CVS 2006-07-19 Andreas Seltenreich * lisp/gnus/mm-url.el (mm-url-insert-file-contents): Inhibit Connection: close workaround for the url package included with Emacs. * lisp/gnus/nnweb.el (nnweb-google-create-mapping): Update regexp. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-367 --- lisp/gnus/mm-url.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lisp/gnus/mm-url.el') diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el index ba21247f356..5e228f0af72 100644 --- a/lisp/gnus/mm-url.el +++ b/lisp/gnus/mm-url.el @@ -301,7 +301,13 @@ If `mm-url-use-external' is non-nil, use `mm-url-program'." (list url (buffer-size))) (mm-url-load-url) (let ((name buffer-file-name) - (url-request-extra-headers (list (cons "Connection" "Close"))) + (url-request-extra-headers + ;; ISTM setting a Connection header was a workaround for + ;; older versions of url included with w3, but it does more + ;; harm than good with the one shipped with Emacs. --ansel + (if (not (and (boundp 'url-version) + (equal url-version "Emacs"))) + (list (cons "Connection" "Close")))) (url-package-name (or mm-url-package-name url-package-name)) (url-package-version (or mm-url-package-version -- cgit v1.2.3