From c21436cb353f8194db647bde2a5ef434eb3dcb2a Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 25 Jun 2023 23:58:12 +0900
Subject: [ruby/uri] Fix host part in relative referece #83

In relative referece, host part can be ommitted but can not be empty.

https://github.com/ruby/uri/commit/2980f0ba02
---
 lib/uri/rfc3986_parser.rb | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb
index 59e2be2805..ffdcfa9227 100644
--- a/lib/uri/rfc3986_parser.rb
+++ b/lib/uri/rfc3986_parser.rb
@@ -26,11 +26,6 @@ module URI
     ]x
 
     USERINFO = /(?:%\h\h|[!$&-.0-9:;=A-Z_a-z~])*+/
-    AUTHORITY = %r[
-      (?:(?<userinfo>#{USERINFO.source})@)?
-      (?<host>#{HOST.source.delete(" \n")})
-      (?::(?<port>\d*+))?
-    ]x
 
     SCHEME = %r[[A-Za-z][+\-.0-9A-Za-z]*+].source
     SEG = %r[(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/])].source
@@ -42,7 +37,11 @@ module URI
     (?<URI>
       (?<scheme>#{SCHEME}):
       (?<hier-part>//
-        (?<authority>#{AUTHORITY})
+        (?<authority>
+          (?:(?<userinfo>#{USERINFO.source})@)?
+          (?<host>#{HOST.source.delete(" \n")})
+          (?::(?<port>\d*+))?
+        )
         (?<path-abempty>(?:/\g<seg>*+)?)
       | (?<path-absolute>/((?!/)\g<seg>++)?)
       | (?<path-rootless>(?!/)\g<seg>++)
@@ -56,7 +55,11 @@ module URI
     (?<seg>#{SEG}){0}
     (?<relative-ref>
       (?<relative-part>//
-        (?<authority>#{AUTHORITY})
+        (?<authority>
+          (?:(?<userinfo>#{USERINFO.source})@)?
+          (?<host>#{HOST.source.delete(" \n")}(?<!/))?
+          (?::(?<port>\d*+))?
+        )
         (?<path-abempty>(?:/\g<seg>*+)?)
       | (?<path-absolute>/\g<seg>*+)
       | (?<path-noscheme>#{SEG_NC}++(?:/\g<seg>*+)?)
-- 
cgit v1.2.3