Remove internal URIs module and depend on URIs.jl instead

Project.toml

@@ -9,10 +9,12 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 IniFile = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
 MbedTLS = "739be429-bea8-5141-9913-cc70e7f3736d"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
+URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
 
 [compat]
 IniFile = "0.5"
 MbedTLS = "0.6.8, 0.7, 1"
+URIs = "1"
 julia = "0.7, 1"
 
 [extras]

src/AWS4AuthRequest.jl

@@ -4,7 +4,7 @@ using ..Base64
 using ..Dates
 using MbedTLS: digest, MD_SHA256, MD_MD5
 import ..Layer, ..request, ..Headers
-using ..URIs
+using URIs
 using ..Pairs: getkv, setkv, rmkv
 import ..@debug, ..DEBUG_LEVEL
 

src/BasicAuthRequest.jl

@@ -3,7 +3,7 @@ module BasicAuthRequest
 using ..Base64
 
 import ..Layer, ..request
-using ..URIs
+using URIs
 using ..Pairs: getkv, setkv
 import ..@debug, ..DEBUG_LEVEL
 

src/ConnectionRequest.jl

@@ -1,7 +1,7 @@
 module ConnectionRequest
 
 import ..Layer, ..request
-using ..URIs, ..Sockets
+using URIs, ..Sockets
 using ..Messages
 using ..IOExtras
 using ..ConnectionPool

src/ContentTypeRequest.jl

@@ -1,7 +1,7 @@
 module ContentTypeDetection
 
 import ..Layer, ..request
-using ..URIs
+using URIs
 using ..Pairs: getkv, setkv
 import ..sniff
 import ..Form

src/CookieRequest.jl

@@ -2,7 +2,7 @@ module CookieRequest
 
 import ..Dates
 import ..Layer, ..request
-using ..URIs
+using URIs
 using ..Cookies
 using ..Pairs: getkv, setkv
 import ..@debug, ..DEBUG_LEVEL

src/HTTP.jl

@@ -8,16 +8,15 @@ export startwrite, startread, closewrite, closeread, stack, insert, AWS4AuthLaye
 const DEBUG_LEVEL = Ref(0)
 
 Base.@deprecate escape escapeuri
-Base.@deprecate URL URI
 
 using Base64, Sockets, Dates
+using URIs
 
 include("debug.jl")
 
 include("Pairs.jl")                    ;using .Pairs
 include("IOExtras.jl")                 ;using .IOExtras
 include("Strings.jl")
-include("URIs.jl")                     ;using .URIs
 include("sniff.jl")
 include("multipart.jl")
 include("Parsers.jl")                  ;import .Parsers: Headers, Header,

src/Handlers.jl

@@ -208,7 +208,8 @@ export serve, Handler, handle, RequestHandlerFunction, StreamHandlerFunction,
        RequestHandler, StreamHandler,
        Router, @register, register!
 
-using ..Messages, ..URIs, ..Streams, ..IOExtras, ..Servers, ..Sockets
+using URIs
+using ..Messages, ..Streams, ..IOExtras, ..Servers, ..Sockets
 
 """
     HTTP.handle(handler::HTTP.RequestHandler, ::HTTP.Request) => HTTP.Response

src/MessageRequest.jl

@@ -1,16 +1,23 @@
 module MessageRequest
 
-export body_is_a_stream, body_was_streamed, setuseragent!
+export body_is_a_stream, body_was_streamed, setuseragent!, resource
 
 
 import ..Layer, ..request
 using ..IOExtras
-using ..URIs
+using URIs
 using ..Messages
 import ..Messages: bodylength
 import ..Headers
 import ..Form, ..content_type
 
+"""
+"request-target" per https://tools.ietf.org/html/rfc7230#section-5.3
+"""
+resource(uri::URI) = string( isempty(uri.path)     ? "/" :     uri.path,
+                            !isempty(uri.query)    ? "?" : "", uri.query,
+                            !isempty(uri.fragment) ? "#" : "", uri.fragment)
+
 """
     request(MessageLayer, method, ::URI, headers, body) -> HTTP.Response
 

src/RedirectRequest.jl

@@ -1,7 +1,7 @@
 module RedirectRequest
 
 import ..Layer, ..request
-using ..URIs
+using URIs
 using ..Messages
 using ..Pairs: setkv
 import ..Header