Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 02:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Follow <meta> redirects in eww

Browse source 
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:
This commit is contained in:
Lars Ingebrigtsen 2015-12-25 18:18:42 +01:00
parent 24228d28dc
commit ba82d68819
1 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lisp/net/eww.el
View file

@ -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))