summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2015-12-25 18:18:42 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2015-12-25 20:52:05 +0100
commitba82d68819f2bc2b666f548fb76825f13b093dfa (patch)
treef0c048726e30b9bc3b45b4df186b8c02930cc141 /lisp/net
parent24228d28dc97ca924a36f249365ad183ca4836c7 (diff)
downloademacs-ba82d68819f2bc2b666f548fb76825f13b093dfa.tar.gz
emacs-ba82d68819f2bc2b666f548fb76825f13b093dfa.tar.bz2
emacs-ba82d68819f2bc2b666f548fb76825f13b093dfa.zip
Follow <meta> redirects in eww
Merge conflict, but I think I resolved it. Follow meta refresh tags in eww * eww.el (eww-tag-meta): Follow meta refresh tags (bug#22234). Backport:
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/eww.el37
1 files changed, 30 insertions, 7 deletions
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 29b4b876465..033529d0616 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -407,13 +407,15 @@ Currently this means either text/html or application/xhtml+xml."
(inhibit-modification-hooks t)
(shr-target-id (url-target (url-generic-parse-url url)))
(shr-external-rendering-functions
- '((title . eww-tag-title)
- (form . eww-tag-form)
- (input . eww-tag-input)
- (textarea . eww-tag-textarea)
- (select . eww-tag-select)
- (link . eww-tag-link)
- (a . eww-tag-a))))
+ (append
+ '((title . eww-tag-title)
+ (form . eww-tag-form)
+ (input . eww-tag-input)
+ (textarea . eww-tag-textarea)
+ (select . eww-tag-select)
+ (link . eww-tag-link)
+ (meta . eww-tag-meta)
+ (a . eww-tag-a)))))
(erase-buffer)
(shr-insert-document document)
(cond
@@ -458,6 +460,27 @@ Currently this means either text/html or application/xhtml+xml."
where
(plist-put eww-data (cdr where) href))))
+(defvar eww-redirect-level 1)
+
+(defun eww-tag-meta (dom)
+ (when (and (cl-equalp (dom-attr dom 'http-equiv) "refresh")
+ (< eww-redirect-level 5))
+ (when-let (refresh (dom-attr dom 'content))
+ (when (or (string-match "^\\([0-9]+\\) *;.*url=\"\\([^\"]+\\)\"" refresh)
+ (string-match "^\\([0-9]+\\) *;.*url=\\([^ ]+\\)" refresh))
+ (let ((timeout (match-string 1 refresh))
+ (url (match-string 2 refresh))
+ (eww-redirect-level (1+ eww-redirect-level)))
+ (if (equal timeout "0")
+ (eww (shr-expand-url url))
+ (eww-tag-a
+ (dom-node 'a `((href . ,(shr-expand-url url)))
+ (format "Auto refresh in %s second%s disabled"
+ timeout
+ (if (equal timeout "1")
+ ""
+ "s"))))))))))
+
(defun eww-tag-link (dom)
(eww-handle-link dom)
(shr-generic dom))