master 8348ace63a 1/3: Revert "Fix about:protocols in EWW"

[Lars Ingebrigtsen]

branch: master
commit 8348ace63a9c2cd039cad855784e2c352c3bb789
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Revert "Fix about:protocols in EWW"
    
    This reverts commit b49c1740105dd3715315aa433674c95f44aaeac4.
    
    We're making this obsolete instead.
---
 lisp/net/eww.el       |  3 ---
 lisp/url/url-about.el |  2 +-
 lisp/url/url-http.el  | 48 ++++++++++++++++++++++--------------------------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 0ee5ebff81..b7b2e08975 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -450,9 +450,6 @@ For more information, see Info node `(eww) Top'."
        ;; Don't mangle file: URLs at all.
         ((string-match-p "\\`ftp://"; url)
          (user-error "FTP is not supported"))
-        ((string-match-p "\\`about:" url)
-         ;; Treat this as an about: url.  (bug#56885)
-         url)
         (t
         ;; Anything that starts with something that vaguely looks
         ;; like a protocol designator is interpreted as a full URL.
diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index ee94fde8b4..a50986d511 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -93,7 +93,7 @@
     (if (fboundp func)
        (progn
          (set-buffer (generate-new-buffer " *about-data*"))
-         (insert "Content-type: text/html\n\n")
+         (insert "Content-type: text/plain\n\n")
          (funcall func url)
          (current-buffer))
       (error "URL does not know about `%s'" item))))
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index e2d28974b6..125f8436f6 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -237,32 +237,28 @@ request.")
     (if (not (url-p url-current-lastloc))
         (setq url-current-lastloc (url-generic-parse-url url-current-lastloc)))
     (let ((referer (copy-sequence url-current-lastloc)))
-      ;; In the case of `url-about', there is actually no host.
-      (if (url-host referer)
-          (progn
-            (setf (url-host referer) (puny-encode-domain (url-host referer)))
-            (let ((referer-string (url-recreate-url referer)))
-              (when (and (not (memq url-privacy-level '(low high paranoid)))
-                         (not (and (listp url-privacy-level)
-                                   (memq 'lastloc url-privacy-level))))
-                ;; url-privacy-level allows referer.  But 
url-lastloc-privacy-level
-                ;; may restrict who we send it to.
-                (cl-case url-lastloc-privacy-level
-                  (host-match
-                   (let ((referer-host (url-host referer))
-                         (url-host (url-host url)))
-                     (when (string= referer-host url-host)
-                       referer-string)))
-                  (domain-match
-                   (let ((referer-domain (url-domain referer))
-                         (url-domain (url-domain url)))
-                     (when (and referer-domain
-                                url-domain
-                                (string= referer-domain url-domain))
-                       referer-string)))
-                  (otherwise
-                   referer-string)))))
-        nil))))
+      (setf (url-host referer) (puny-encode-domain (url-host referer)))
+      (let ((referer-string (url-recreate-url referer)))
+        (when (and (not (memq url-privacy-level '(low high paranoid)))
+                   (not (and (listp url-privacy-level)
+                             (memq 'lastloc url-privacy-level))))
+          ;; url-privacy-level allows referer.  But url-lastloc-privacy-level
+          ;; may restrict who we send it to.
+          (cl-case url-lastloc-privacy-level
+            (host-match
+             (let ((referer-host (url-host referer))
+                   (url-host (url-host url)))
+               (when (string= referer-host url-host)
+                 referer-string)))
+            (domain-match
+             (let ((referer-domain (url-domain referer))
+                   (url-domain (url-domain url)))
+               (when (and referer-domain
+                          url-domain
+                          (string= referer-domain url-domain))
+                 referer-string)))
+            (otherwise
+             referer-string)))))))
 
 ;; Building an HTTP request
 (defun url-http-user-agent-string ()