Decode entities before feeding URLs to curl.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 414d7aa..15c779b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-html.el (gnus-html-schedule-image-fetching): Decode entities
+       before feeding URLs to curl.
+
 2010-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-html.el (gnus-html-wash-tags, gnus-html-put-image): Mark cid and

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index bf9f0cd..52644d7 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -247,7 +247,7 @@ fit these criteria."
                   "--location"
                   "--max-time" "60"
                   "-o" (gnus-html-image-id url)
-                  url)))
+                  (mm-url-decode-entities-string url))))
     (process-kill-without-query process)
     (set-process-sentinel process 'gnus-html-curl-sentinel)
     (gnus-set-process-plist process (list 'images images
@@ -395,7 +395,7 @@ This only works if the article in question is HTML."
          (let ((url (match-string 1)))
            (unless (gnus-html-image-url-blocked-p url blocked-images)
               (unless (file-exists-p (gnus-html-image-id url))
-                (push url urls)
+                (push (mm-url-decode-entities url) urls)
                 (push (gnus-html-image-id url) urls)
                 (push "-o" urls)))))
        (let ((process