0.6 tweaks

Rename some files to match module names.

Author: samoconnor

src/ConnectionPool.jl

@@ -182,6 +182,8 @@ function Base.readavailable(t::Transaction)::ByteView
 end
 
 
+@static if VERSION < v"0.7.0-DEV.2915" const copyto! = copy!  end
+
 function Base.readbytes!(t::Transaction, a::Vector{UInt8}, nb::Int)
 
     if !isempty(t.c.excess)

src/HTTP.jl

@@ -9,20 +9,20 @@ const DEBUG_LEVEL = 0
 const minimal = false
 
 include("compat.jl")
-
 include("debug.jl")
+
 include("Pairs.jl")
 include("Strings.jl")
 include("IOExtras.jl")                 ;import .IOExtras.IOError
-include("uri.jl")                      ;using .URIs
+include("URIs.jl")                     ;using .URIs
                                                                      if !minimal
 include("consts.jl")
 include("utils.jl")
 include("fifobuffer.jl")               ;using .FIFOBuffers
 include("cookies.jl")                  ;using .Cookies
 include("multipart.jl")
                                                                              end
-include("parser.jl")                   ;import .Parsers: Parser, Headers, Header,
+include("Parsers.jl")                  ;import .Parsers: Parser, Headers, Header,
                                                          ParsingError, ByteView
 include("ConnectionPool.jl")
 include("Messages.jl")                 ;using .Messages
@@ -582,8 +582,8 @@ include("WebSockets.jl")               ;using .WebSockets
                                                                              end
 include("client.jl")
 include("sniff.jl")
-include("handlers.jl");                  using .Handlers
-include("server.jl");                    using .Servers.listen
+include("Handlers.jl");                  using .Handlers
+include("Servers.jl");                   using .Servers.listen
                                                                              end
 include("precompile.jl")
 

src/parser.jl renamed to src/Parsers.jl

@@ -165,7 +165,7 @@ https://tools.ietf.org/html/rfc7231#section-6.2.1
 function handle_continue(http::Stream{Response})
     if http.message.status == 100
         @debug 1 "✅  Continue:   $(http.stream)"
-        configure_parser(http)
+        reset!(http.parser)
         readheaders(http.stream, http.parser, http.message)
     end
 

src/server.jl renamed to src/Servers.jl

@@ -1,6 +1,6 @@
 module TimeoutRequest
 
-import ..Layer, ..request, ..lockedby
+import ..Layer, ..request
 using ..ConnectionPool
 import ..@debug, ..DEBUG_LEVEL
 

src/Streams.jl

@@ -1,5 +1,4 @@
 taskid(t=current_task()) = hex(hash(t) & 0xffff, 4)
-taskid(l::ReentrantLock) = islocked(l) ? taskid(lockedby(l)) : ""
 
 macro debug(n::Int, s)
     DEBUG_LEVEL >= n ? :(println("DEBUG: ", taskid(), " ", $(esc(s)))) :

src/TimeoutRequest.jl

@@ -1,8 +1,10 @@
-using Test
+@static if VERSION > v"0.7.0-DEV.2005"
+    using Test
+    using Base64
+end
 using HTTP
 using JSON
 using MbedTLS: digest, MD_MD5, MD_SHA256
-using Base64
 
 using HTTP.IOExtras
 using HTTP.request
@@ -46,8 +48,9 @@ function dump_async_exception(e, st)
     print(String(take!(buf)))
 end
 
-if haskey(ENV, "AWS_ACCESS_KEY_ID") ||
-   haskey(ENV, "AWS_DEFAULT_PROFILE")
+if VERSION > v"0.7.0-DEV.2338" &&
+   (haskey(ENV, "AWS_ACCESS_KEY_ID") ||
+    haskey(ENV, "AWS_DEFAULT_PROFILE"))
 @testset "async s3 dup$dup, count$count, sz$sz, pipw$pipe, $http, $mode" for
     count in [10, 100, 1000],
     dup in [0, 7],
@@ -144,6 +147,10 @@ for i = 1:count
     @test a == put_data_sums[i]
 end
 
+if haskey(ENV, "HTTP_JL_TEST_QUICK_ASYNC")
+    break
+end
+
 end # testset
 end # if haskey(ENV, "AWS_ACCESS_KEY_ID")
 
@@ -299,6 +306,11 @@ println("running async $count, 1:$num, $config, $http C")
     HTTP.ConnectionPool.showpool(STDOUT)
     HTTP.ConnectionPool.closeall()
 
+
+    if haskey(ENV, "HTTP_JL_TEST_QUICK_ASYNC")
+        break
+    end
+
 end # testset
 
 stop_pool_dump=true

src/uri.jl renamed to src/URIs.jl

@@ -11,7 +11,7 @@ for sch in ("http", "https")
     @test status(HTTP.get("$sch://httpbin.org/ip")) == 200
     @test status(HTTP.head("$sch://httpbin.org/ip")) == 200
     @test status(HTTP.options("$sch://httpbin.org/ip")) == 200
-    @test status(HTTP.post("$sch://httpbin.org/ip"; statusexception=false)) == 405
+    @test status(HTTP.post("$sch://httpbin.org/ip"; status_exception=false)) == 405
     @test status(HTTP.post("$sch://httpbin.org/post")) == 200
     @test status(HTTP.put("$sch://httpbin.org/put")) == 200
     @test status(HTTP.delete("$sch://httpbin.org/delete")) == 200