From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Steven Allen Newsgroups: gmane.emacs.bugs Subject: bug#42869: [PATCH] Fix url-expand-file-name when applied to file:/// URLs Date: Fri, 14 Aug 2020 13:37:51 -0700 Message-ID: <20200814203751.35684-1-steven@stebalien.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16965"; mail-complaints-to="usenet@ciao.gmane.io" To: 42869@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Aug 14 22:39:13 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k6gTp-0004Ia-8J for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 14 Aug 2020 22:39:13 +0200 Original-Received: from localhost ([::1]:33112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6gTn-0006Od-Q8 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 14 Aug 2020 16:39:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6gTe-0006OT-8h for bug-gnu-emacs@gnu.org; Fri, 14 Aug 2020 16:39:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k6gTd-0004Fb-Ve for bug-gnu-emacs@gnu.org; Fri, 14 Aug 2020 16:39:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k6gTd-0002YL-Sw for bug-gnu-emacs@gnu.org; Fri, 14 Aug 2020 16:39:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Steven Allen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Aug 2020 20:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42869 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.15974374869747 (code B ref -1); Fri, 14 Aug 2020 20:39:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 14 Aug 2020 20:38:06 +0000 Original-Received: from localhost ([127.0.0.1]:53976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k6gSk-0002X8-9B for submit@debbugs.gnu.org; Fri, 14 Aug 2020 16:38:06 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:35518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k6gSh-0002X0-UW for submit@debbugs.gnu.org; Fri, 14 Aug 2020 16:38:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6gSh-0006KD-Nr for bug-gnu-emacs@gnu.org; Fri, 14 Aug 2020 16:38:03 -0400 Original-Received: from outgoing-stata.csail.mit.edu ([128.30.2.210]:39390) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6gSf-0004Bs-Tg for bug-gnu-emacs@gnu.org; Fri, 14 Aug 2020 16:38:03 -0400 Original-Received: from c-73-241-148-239.hsd1.ca.comcast.net ([73.241.148.239] helo=localhost) by outgoing-stata.csail.mit.edu with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k6gSX-000Nba-CR for bug-gnu-emacs@gnu.org; Fri, 14 Aug 2020 16:37:53 -0400 X-Mailer: git-send-email 2.28.0 Received-SPF: pass client-ip=128.30.2.210; envelope-from=steven@stebalien.com; helo=outgoing-stata.csail.mit.edu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/14 16:37:53 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:185168 Archived-At: This code is supposed to update the portspec slot in the url object, but was attempting to setf whatever url-port happened to return (not necessarily the portspec slot). * lisp/url/url-expand.el (url-default-expander): Set `url-portspec'. --- lisp/url/url-expand.el | 2 +- test/lisp/url/url-expand-tests.el | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index f34ef810c4a..be9b5426dc4 100644 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@ -120,7 +120,7 @@ url-default-expander ;; Well, they told us the scheme, let's just go with it. nil (setf (url-type urlobj) (or (url-type urlobj) (url-type defobj))) - (setf (url-port urlobj) (or (url-portspec urlobj) + (setf (url-portspec urlobj) (or (url-portspec urlobj) (and (string= (url-type urlobj) (url-type defobj)) (url-port defobj)))) diff --git a/test/lisp/url/url-expand-tests.el b/test/lisp/url/url-expand-tests.el index 6e0ce869502..3b0b6fbd41a 100644 --- a/test/lisp/url/url-expand-tests.el +++ b/test/lisp/url/url-expand-tests.el @@ -100,6 +100,13 @@ url-expand-file-name/relative-resolution-additional-examples (should (equal (url-expand-file-name "foo#bar" "http://host/foobar") "http://host/foo#bar")) (should (equal (url-expand-file-name "foo#bar" "http://host/foobar/") "http://host/foobar/foo#bar"))) +(ert-deftest url-expand-file-name/relative-resolution-file-url () + "RFC 3986, Section 5.4 Reference Resolution Examples / Section 5.4.1. Normal Examples" + (should (equal (url-expand-file-name "bar.html" "file:///a/b/c/foo.html") "file:///a/b/c/bar.html")) + (should (equal (url-expand-file-name "bar.html" "file:///a/b/c/") "file:///a/b/c/bar.html")) + (should (equal (url-expand-file-name "../d/bar.html" "file:///a/b/c/") "file:///a/b/d/bar.html")) + (should (equal (url-expand-file-name "../d/bar.html" "file:///a/b/c/foo.html") "file:///a/b/d/bar.html"))) + (provide 'url-expand-tests) ;;; url-expand-tests.el ends here -- 2.28.0