From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Hartwig Newsgroups: gmane.lisp.guile.bugs Subject: bug#10410: guile: uri module confused by domain names starting with numbers, ipv6 addresses Date: Sat, 31 Dec 2011 00:27:53 +0800 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=14dae93404fbf193e904b551b61a X-Trace: dough.gmane.org 1325262498 15581 80.91.229.12 (30 Dec 2011 16:28:18 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 30 Dec 2011 16:28:18 +0000 (UTC) Cc: guile-devel@gnu.org To: 10410@debbugs.gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Fri Dec 30 17:28:13 2011 Return-path: Envelope-to: guile-bugs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RgfJT-0007FD-6d for guile-bugs@m.gmane.org; Fri, 30 Dec 2011 17:28:11 +0100 Original-Received: from localhost ([::1]:36663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgfJS-0005Lq-QG for guile-bugs@m.gmane.org; Fri, 30 Dec 2011 11:28:10 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:59505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgfJP-0005Ll-Dw for bug-guile@gnu.org; Fri, 30 Dec 2011 11:28:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RgfJO-0007Dj-1L for bug-guile@gnu.org; Fri, 30 Dec 2011 11:28:07 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:59191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgfJN-0007Df-Ug for bug-guile@gnu.org; Fri, 30 Dec 2011 11:28:06 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1RgfME-0001TC-3V for bug-guile@gnu.org; Fri, 30 Dec 2011 11:31:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Daniel Hartwig Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-guile@gnu.org Resent-Date: Fri, 30 Dec 2011 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10410 X-GNU-PR-Package: guile X-GNU-PR-Keywords: patch Original-Received: via spool by 10410-submit@debbugs.gnu.org id=B10410.13252626535636 (code B ref 10410); Fri, 30 Dec 2011 16:31:02 +0000 Original-Received: (at 10410) by debbugs.gnu.org; 30 Dec 2011 16:30:53 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RgfM4-0001Sr-N1 for submit@debbugs.gnu.org; Fri, 30 Dec 2011 11:30:53 -0500 Original-Received: from mail-iy0-f172.google.com ([209.85.210.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RgfM2-0001Sg-3I for 10410@debbugs.gnu.org; Fri, 30 Dec 2011 11:30:51 -0500 Original-Received: by iabz21 with SMTP id z21so3395795iab.3 for <10410@debbugs.gnu.org>; Fri, 30 Dec 2011 08:27:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=JE46rLeQnnAMh5LvdSbkOmiaGwnTGhqnw+N1A7er2ss=; b=rDZ4k4RNcHnlJldunNeR/2+vcNFTy+zYJ97cE+02iDuFemjyqRhSKVhsXjmNLEwLIS VjJMyf+M7Zag5RONd/u/vkCmju54cFV/wxGh1QxMU19RhoA/uRvVnAKnr53QGnC0wfCN KTrVvDQPpJYW2tLaTZYA2Nt6GPeH2M6Fe6h7U= Original-Received: by 10.50.214.36 with SMTP id nx4mr14745776igc.14.1325262473106; Fri, 30 Dec 2011 08:27:53 -0800 (PST) Original-Received: by 10.231.48.68 with HTTP; Fri, 30 Dec 2011 08:27:53 -0800 (PST) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Fri, 30 Dec 2011 11:31:02 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Original-Sender: bug-guile-bounces+guile-bugs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.bugs:6020 Archived-At: --14dae93404fbf193e904b551b61a Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 30 December 2011 18:14, Daniel Hartwig wrote: > > `string->uri' requires similar changes to support the ipv6 address > literals. =C2=A0I'm yet to found a very elegant way to do this though it = is > easy enough to simply butcher `authority-pat'. So the issue was really with `parse-authority'. The attached patch cleans this up with support for IPv6 (including dotted-quad notation), fixes some typos in the tests, and adds new tests. With both patches applied the web-uri.test now passes for all tests and I can finally do: scheme@(guile-user)> (string->uri "http://[::ffff:192.0.2.1]/foo") $2 =3D #< scheme: http userinfo: #f host: "[::ffff:192.0.2.1]" port: #f path: "/foo" query: #f fragment: #f> scheme@(guile-user)> (string->uri "http://123.com") $3 =3D #< scheme: http userinfo: #f host: "123.com" port: #f path: "" query: #f fragment: #f> --14dae93404fbf193e904b551b61a Content-Type: text/x-patch; charset=US-ASCII; name="0002-enhance-IPv6-support.patch" Content-Disposition: attachment; filename="0002-enhance-IPv6-support.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gwtet69z1 RnJvbSBiODM5YWE5MDljNjFlZjJlZTY4ZWE2NTJlNmUwMDk1YWZjM2YyZjI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWwgSGFydHdpZyA8bWFuZHlrZUBnbWFpbC5jb20+CkRh dGU6IFNhdCwgMzEgRGVjIDIwMTEgMDA6MTY6NDIgKzA4MDAKU3ViamVjdDogW1BBVENIIDIvMl0g ZW5oYW5jZSBJUHY2IHN1cHBvcnQKCiogbW9kdWxlL3dlYi91cmkuc2NtICh2YWxpZC1ob3N0Pyk6 IFN1cHBvcnQgZG90dGVkLXF1YWQgbm90YXRpb24KICBpbiBJUHY2IGFkZHJlc3Nlcy4KICAocGFy c2UtYXV0aG9yaXR5KTogU3VwcG9ydCBJUHY2IGxpdGVyYWxzLgoqIHRlc3Qtc3VpdGUvdGVzdHMv d2ViLXVyaS50ZXN0OiBBZGQgYW5kIGZpeCB0ZXN0cy4KLS0tCiBtb2R1bGUvd2ViL3VyaS5zY20g ICAgICAgICAgICB8ICAgIDQgKystLQogdGVzdC1zdWl0ZS90ZXN0cy93ZWItdXJpLnRlc3QgfCAg IDE2ICsrKysrKysrKysrKy0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwg NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9tb2R1bGUvd2ViL3VyaS5zY20gYi9tb2R1bGUv d2ViL3VyaS5zY20KaW5kZXggZmYxMzg0Ny4uYjhhNjk1MSAxMDA2NDQKLS0tIGEvbW9kdWxlL3dl Yi91cmkuc2NtCisrKyBiL21vZHVsZS93ZWIvdXJpLnNjbQpAQCAtOTEsNyArOTEsNyBAQCBjb25z aXN0ZW5jeSBjaGVja3MgdG8gbWFrZSBzdXJlIHRoYXQgdGhlIGNvbnN0cnVjdGVkIFVSSSBpcyB2 YWxpZC4iCiAoZGVmaW5lIGlwdjQtcmVnZXhwCiAgIChtYWtlLXJlZ2V4cCAiXihbMC05Ll0rKSQi KSkKIChkZWZpbmUgaXB2Ni1yZWdleHAKLSAgKG1ha2UtcmVnZXhwICJeXFxbKFswLTlhLWZBLUY6 XSspXFxdJCIpKQorICAobWFrZS1yZWdleHAgIl5cXFsoWzAtOWEtZkEtRjouXSspXFxdJCIpKQog KGRlZmluZSBkb21haW4tbGFiZWwtcmVnZXhwCiAgIChtYWtlLXJlZ2V4cCAiXlthLXpBLVowLTld KFthLXpBLVowLTktXSpbYS16QS1aMC05XSk/JCIpKQogKGRlZmluZSB0b3AtbGFiZWwtcmVnZXhw CkBAIC0xMTYsNyArMTE2LDcgQEAgY29uc2lzdGVuY3kgY2hlY2tzIHRvIG1ha2Ugc3VyZSB0aGF0 IHRoZSBjb25zdHJ1Y3RlZCBVUkkgaXMgdmFsaWQuIgogKGRlZmluZSB1c2VyaW5mby1wYXQKICAg IlthLXpBLVowLTlfLiF+KicoKTs6Jj0rJCwtXSsiKQogKGRlZmluZSBob3N0LXBhdAotICAiW2Et ekEtWjAtOS4tXSsiKQorICAiW2EtekEtWjAtOS4tXSt8XFxbWzAtOWEtRkEtRjouXStcXF0iKQog KGRlZmluZSBwb3J0LXBhdAogICAiWzAtOV0qIikKIChkZWZpbmUgYXV0aG9yaXR5LXJlZ2V4cApk aWZmIC0tZ2l0IGEvdGVzdC1zdWl0ZS90ZXN0cy93ZWItdXJpLnRlc3QgYi90ZXN0LXN1aXRlL3Rl c3RzL3dlYi11cmkudGVzdAppbmRleCA0Zjg1OWUwLi5jZDZhOTQ0IDEwMDY0NAotLS0gYS90ZXN0 LXN1aXRlL3Rlc3RzL3dlYi11cmkudGVzdAorKysgYi90ZXN0LXN1aXRlL3Rlc3RzL3dlYi11cmku dGVzdApAQCAtMTAyLDYgKzEwMiwxMCBAQAogICAgICh1cmk9PyAoYnVpbGQtdXJpICdodHRwICM6 aG9zdCAiWzIwMDE6ZGI4OjoxXSIpCiAgICAgICAgICAgICM6c2NoZW1lICdodHRwICM6aG9zdCAi WzIwMDE6ZGI4OjoxXSIgIzpwYXRoICIiKSkKIAorICAocGFzcy1pZiAiaHR0cDovL1s6OmZmZmY6 MTkyLjAuMi4xXSIKKyAgICAodXJpPT8gKGJ1aWxkLXVyaSAnaHR0cCAjOmhvc3QgIls6OmZmZmY6 MTkyLjAuMi4xXSIpCisgICAgICAgICAgICM6c2NoZW1lICdodHRwICM6aG9zdCAiWzo6ZmZmZjox OTIuMC4yLjFdIiAjOnBhdGggIiIpKQorCiAgIChwYXNzLWlmLXVyaS1leGNlcHRpb24gImh0dHA6 Ly9mb286bm90LWEtcG9ydCIKICAgICAgICAgICAgICAgICAgICAgICAgICAiRXhwZWN0ZWQuKnBv cnQiCiAgICAgICAgICAgICAgICAgICAgICAgICAgKGJ1aWxkLXVyaSAnaHR0cCAjOmhvc3QgImZv byIgIzpwb3J0ICJub3QtYS1wb3J0IikpCkBAIC0xNjAsMTIgKzE2NCwxNiBAQAogICAgICAgICAg ICAjOnNjaGVtZSAnaHR0cCAjOmhvc3QgIlsyMDAxOmRiODo6MV0iICM6cGF0aCAiIikpCiAKICAg KHBhc3MtaWYgImh0dHA6Ly9bMjAwMTpkYjg6OjFdOjgwIgotICAgICh1cmk9PyAoc3RyaW5nLT51 cmkgImh0dHA6Ly9bMjAwMTpkYjg6OjFdIikKKyAgICAodXJpPT8gKHN0cmluZy0+dXJpICJodHRw Oi8vWzIwMDE6ZGI4OjoxXTo4MCIpCiAgICAgICAgICAgICM6c2NoZW1lICdodHRwCiAgICAgICAg ICAgICM6aG9zdCAiWzIwMDE6ZGI4OjoxXSIKICAgICAgICAgICAgIzpwb3J0IDgwCiAgICAgICAg ICAgICM6cGF0aCAiIikpCiAKKyAgKHBhc3MtaWYgImh0dHA6Ly9bOjpmZmZmOjE5Mi4wLjIuMV0i CisgICAgKHVyaT0/IChzdHJpbmctPnVyaSAiaHR0cDovL1s6OmZmZmY6MTkyLjAuMi4xXSIpCisg ICAgICAgICAgICM6c2NoZW1lICdodHRwICM6aG9zdCAiWzo6ZmZmZjoxOTIuMC4yLjFdIiAjOnBh dGggIiIpKQorCiAgIChwYXNzLWlmICJodHRwOi8vZm9vOiIKICAgICAodXJpPT8gKHN0cmluZy0+ dXJpICJodHRwOi8vZm9vOiIpCiAgICAgICAgICAgICM6c2NoZW1lICdodHRwICM6aG9zdCAiZm9v IiAjOnBhdGggIiIpKQpAQCAtMjIzLDkgKzIzMSw5IEBACiAgICAgKGVxdWFsPyAiaHR0cDovL1sy MDAxOmRiODo6MV0iCiAgICAgICAgICAgICAodXJpLT5zdHJpbmcgKHN0cmluZy0+dXJpICJodHRw Oi8vWzIwMDE6ZGI4OjoxXSIpKSkpCiAKLSAgKHBhc3MtaWYgImh0dHA6Ly9bMjAwMTpkYjg6OjFd OjgwIgotICAgIChlcXVhbD8gImh0dHA6Ly9bMjAwMTpkYjg6OjFdOjgwIgotICAgICAgICAgICAo dXJpLT5zdHJpbmcgKHN0cmluZy0+dXJpICJodHRwOi8vWzIwMDE6ZGI4OjoxXTo4MCIpKSkpCisg IChwYXNzLWlmICJodHRwOi8vWzo6ZmZmZjoxOTIuMC4yLjFdIgorICAgIChlcXVhbD8gImh0dHA6 Ly9bOjpmZmZmOjE5Mi4wLjIuMV0iCisgICAgICAgICAgICAodXJpLT5zdHJpbmcgKHN0cmluZy0+ dXJpICJodHRwOi8vWzo6ZmZmZjoxOTIuMC4yLjFdIikpKSkKIAogICAocGFzcy1pZiAiaHR0cDov L2ZvbzoiCiAgICAgKGVxdWFsPyAiaHR0cDovL2ZvbyIKLS0gCjEuNy41LjQKCg== --14dae93404fbf193e904b551b61a--