From unknown Sat Aug 09 04:57:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#20009: eww-render: misrecognizes XHTML (application/xhtml+xml) Resent-From: Ivan Shmakov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 Mar 2015 19:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20009 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 20009@debbugs.gnu.org X-Debbugs-Original-To: submit@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.142558476315638 (code B ref -1); Thu, 05 Mar 2015 19:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Mar 2015 19:46:03 +0000 Received: from localhost ([127.0.0.1]:36280 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YTbid-00044A-D0 for submit@debbugs.gnu.org; Thu, 05 Mar 2015 14:46:03 -0500 Received: from fely.am-1.org ([78.47.74.50]:58110) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YTbia-00043b-Pm for submit@debbugs.gnu.org; Thu, 05 Mar 2015 14:46:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Type:MIME-Version:Message-ID:Date:Sender:Subject:To:From; bh=bTn9m/eiGwnyNyIfIYfs7f1P4seZxhYbcGxxYAyQoQE=; b=T3J2UJ4EGFEOIKc+MKXyW8I0ny3rEmmYvXJ/VGklN53jGS1703X03256qG/usQzUPfvF60xGJzOg57whKGA2Wo1OZJEl446cCKqMV3gzWV54TridkfH66LCxlEZluOhtHKhFhuH9lClAXjj1QJoyFKQlj/F9Nfbq+/VtWgqJ56k=; Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YTbiZ-0003Ej-2U for submit@debbugs.gnu.org; Thu, 05 Mar 2015 19:45:59 +0000 Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YTbiR-0006No-Rx for submit@debbugs.gnu.org; Fri, 06 Mar 2015 02:45:51 +0700 From: Ivan Shmakov Date: Thu, 05 Mar 2015 19:45:50 +0000 Message-ID: <8761af1b4h.fsf@violet.siamics.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Package: emacs Severity: minor Tags: patch As currently implemented, EWW fails to properly render XHTML documents, when served with Content-Type: application/xhtml+xml. Consider, e. g.: M-x eww RET http://www.x.org/releases/X11R7.7/doc/man/man1/index.xhtml = RET Please thus consider the patch MIMEd. * lisp/net/eww.el (eww-html-p): New function. (eww-render): Use it. (Tested on 619fc5c197eb, 2015-02-26 18:09:48 UTC.) --=20 FSF associate member #7257 np. Memento Mori =E2=80=94 Kamelot =E2=80=A6 3= 013 B6A0 230E 334A --=-=-= Content-Type: text/diff Content-Disposition: inline --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -300,6 +284,12 @@ (interactive "r") (eww (buffer-substring beg end))) +(defun eww-html-p (content-type) + "Return non-nil if CONTENT-TYPE designates an HTML content type. +Currently this means either text/html or application/xhtml+xml." + (string-match-p "^\\(text\\|application\\)/\\(html\\|xhtml\\+xml\\)$" + content-type)) + (defun eww-render (status url &optional point buffer encode) (let ((redirect (plist-get status :redirect))) (when redirect @@ -318,8 +308,7 @@ defun eww-render (status url &optional point buffer encode) (charset (intern (downcase (or (cdr (assq 'charset (cdr content-type))) - (eww-detect-charset (equal (car content-type) - "text/html")) + (eww-detect-charset (eww-html-p (car content-type))) "utf-8")))) (data-buffer (current-buffer))) ;; Save the https peer status. @@ -332,7 +321,7 @@ defun eww-render (status url &optional point buffer encode) (string-match-p eww-use-external-browser-for-content-type (car content-type))) (eww-browse-with-external-browser url)) - ((equal (car content-type) "text/html") + ((eww-html-p (car content-type)) (eww-display-html charset url nil point buffer encode)) ((equal (car content-type) "application/pdf") (eww-display-pdf)) --=-=-=-- From unknown Sat Aug 09 04:57:27 2025 X-Loop: help-debbugs@gnu.org Subject: bug#20009: eww-render: misrecognizes XHTML (application/xhtml+xml) Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 Mar 2015 22:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20009 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Ivan Shmakov Cc: 20009@debbugs.gnu.org Received: via spool by 20009-submit@debbugs.gnu.org id=B20009.14255944555847 (code B ref 20009); Thu, 05 Mar 2015 22:28:02 +0000 Received: (at 20009) by debbugs.gnu.org; 5 Mar 2015 22:27:35 +0000 Received: from localhost ([127.0.0.1]:36527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YTeEw-0001WC-Qg for submit@debbugs.gnu.org; Thu, 05 Mar 2015 17:27:35 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:38859) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YTeEu-0001W4-NW for 20009@debbugs.gnu.org; Thu, 05 Mar 2015 17:27:33 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1YTeEY-0004wn-9n; Thu, 05 Mar 2015 23:27:10 +0100 From: Lars Magne Ingebrigtsen References: <8761af1b4h.fsf@violet.siamics.net> X-Hashcash: 1:23:150305:ivan@siamics.net::+iJucC/YNTpt83EC:0KnwZ X-Hashcash: 1:23:150305:20009@debbugs.gnu.org::E2t7vmc++ug3gN/o:0000000000000000000000000000000000000000emBc Date: Thu, 05 Mar 2015 23:27:09 +0100 In-Reply-To: <8761af1b4h.fsf@violet.siamics.net> (Ivan Shmakov's message of "Thu, 05 Mar 2015 19:45:50 +0000") Message-ID: User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-MailScanner-ID: 1YTeEY-0004wn-9n X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1426199230.51321@5Gi3+Wcb9vX5QvEXkjSd7g X-Spam-Status: No X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Ivan Shmakov writes: > * lisp/net/eww.el (eww-html-p): New function. > (eww-render): Use it. Thanks. I've applied a variant of your patch. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 05 17:27:44 2015 Received: (at control) by debbugs.gnu.org; 5 Mar 2015 22:27:44 +0000 Received: from localhost ([127.0.0.1]:36530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YTeF6-0001Wd-50 for submit@debbugs.gnu.org; Thu, 05 Mar 2015 17:27:44 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:38865) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YTeF5-0001WV-0w for control@debbugs.gnu.org; Thu, 05 Mar 2015 17:27:43 -0500 Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1YTeEm-0004x6-Nv for control@debbugs.gnu.org; Thu, 05 Mar 2015 23:27:24 +0100 Date: Thu, 05 Mar 2015 23:27:24 +0100 Message-Id: To: control@debbugs.gnu.org From: Lars Magne Ingebrigtsen Subject: control message for bug #20009 X-MailScanner-ID: 1YTeEm-0004x6-Nv X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1426199244.79436@sPmRBsGxC6zkU7NzlRX9Zg X-Spam-Status: No X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) tags 20009 fixed close 20009 25.1