aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-10-21 03:48:01 +0000
committerKatsumi Yamaoka2010-10-21 03:48:01 +0000
commitd815edf0e616acb8312be815a423a7f489c93814 (patch)
tree87ce11ccf0029799a8966f212c6b0ab9dcce89b4
parent1171414dae0871ae356b716f623b2799030ca8ab (diff)
downloademacs-d815edf0e616acb8312be815a423a7f489c93814.tar.gz
emacs-d815edf0e616acb8312be815a423a7f489c93814.zip
gnus-html.el (gnus-html-prefetch-images): Only prefetch http images to avoid trying to snarf invalid stuff.
-rw-r--r--lisp/gnus/ChangeLog7
-rw-r--r--lisp/gnus/gnus-html.el2
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f8082923a51..1c3708e9526 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,8 +1,9 @@
12010-10-21 Katsumi Yamaoka <yamaoka@jpl.org> 12010-10-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * gnus-sum.el (gnus-summary-edit-article-done): Bind replace-result. 3 * gnus-html.el (gnus-html-prefetch-images): Only prefetch http images
4 to avoid trying to snarf invalid stuff.
4 5
52010-10-21 Lars Magne Ingebrigtsen <larsi@gnus.org> 6 * gnus-sum.el (gnus-summary-edit-article-done): Bind free variable.
6 7
7 * gnus.el (gnus-message-archive-group): Quote value. 8 * gnus.el (gnus-message-archive-group): Quote value.
8 (gnus-message-archive-group): Mark as changed. 9 (gnus-message-archive-group): Mark as changed.
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 861ad73d089..77f771dc850 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -493,7 +493,7 @@ This only works if the article in question is HTML."
493 (let ((blocked-images (with-current-buffer summary 493 (let ((blocked-images (with-current-buffer summary
494 (gnus-blocked-images)))) 494 (gnus-blocked-images))))
495 (save-match-data 495 (save-match-data
496 (while (re-search-forward "<img[^>]+src=[\"']\\([^\"']+\\)" nil t) 496 (while (re-search-forward "<img[^>]+src=[\"']\\(http[^\"']+\\)" nil t)
497 (let ((url (gnus-html-encode-url (match-string 1)))) 497 (let ((url (gnus-html-encode-url (match-string 1))))
498 (unless (gnus-html-image-url-blocked-p url blocked-images) 498 (unless (gnus-html-image-url-blocked-p url blocked-images)
499 (when (gnus-html-cache-expired url gnus-html-image-cache-ttl) 499 (when (gnus-html-cache-expired url gnus-html-image-cache-ttl)