disallow bugs in @try usage

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '~1.8.0-0' # 1.8 beta
+          - '1.6'
           - '1' # automatically expands to the latest stable 1.x release of Julia
           - 'nightly'
         os:
@@ -30,12 +30,10 @@ jobs:
           - windows-latest
         arch:
           - x64
-          - x86
-        exclude:
-          - os: macOS-latest
-            arch: x86
+        include:
           - os: windows-latest
-            version: 'nightly'
+            version: '1'
+            arch: x86
     steps:
       - uses: actions/checkout@v2
       - name: setup python

src/Exceptions.jl

@@ -5,15 +5,20 @@ import ..HTTP # for doc references
 
 @eval begin
 """
-    @try expr
+    @try Permitted Error Types expr
 
 Convenience macro for wrapping an expression in a try/catch block
 where thrown exceptions are ignored.
 """
-macro $(:try)(ex)
+macro $(:try)(exes...)
+    errs = Any[exes...]
+    ex = pop!(errs)
+    isempty(errs) && error("no permitted errors")
     quote
         try $(esc(ex))
-        catch
+        catch e
+            e isa InterruptException && rethrow(e)
+            |($([:(e isa $(esc(err))) for err in errs]...)) || rethrow(e)
         end
     end
 end

src/Messages.jl

@@ -570,7 +570,6 @@ function bodysummary(body::Form)
     end
     return "[Message Body was streamed]"
 end
-bodysummary(body::Union{Dict, NamedTuple}) = URIs.escapeuri(body)
 
 function compactstartline(m::Message)
     b = IOBuffer()

src/Servers.jl

@@ -90,7 +90,10 @@ function getsslcontext(tcp, sslconfig)
         MbedTLS.handshake!(ssl)
         return ssl
     catch e
-        return nothing
+        @try Base.IOError close(tcp)
+        e isa Base.IOError && return nothing
+        e isa MbedTLS.MbedException && return nothing
+        rethrow(e)
     end
 end
 
@@ -145,28 +148,16 @@ closedorclosing(st) = st == CLOSING || st == CLOSED
 
 function requestclose!(c::Connection)
     if c.state == IDLE
-        closewriteandwait(c)
-        close(c)
         c.state = CLOSED
+        close(c)
     else
         c.state = CLOSING
     end
     return
 end
 
-function closewriteandwait(c::Connection)
-    io = IOExtras.tcpsocket(ConnectionPool.getrawstream(c))
-    @try begin
-        flush(io)
-        closewrite(io)
-        sleep(0.5) # give time for client to receive FIN
-    end
-    return
-end
-
 function closeconnection(c::Connection)
     c.state = CLOSED
-    closewriteandwait(c)
     close(c)
     return
 end
@@ -474,7 +465,7 @@ function handle_connection(f, c::Connection, listener, readtimeout, access_log)
                 c.state = CLOSING
             finally
                 if access_log !== nothing
-                    @try(@info sprint(access_log, http) _group=:access)
+                    @try(Any, @info sprint(access_log, http) _group=:access)
                 end
             end
         end

src/Streams.jl

@@ -109,7 +109,7 @@ Write the final `0` chunk if needed.
 function closebody(http::Stream)
     if http.writechunked
         http.writechunked = false
-        @try write(http.stream, "0\r\n\r\n")
+        @try Base.IOError write(http.stream, "0\r\n\r\n")
     end
 end
 
@@ -374,6 +374,7 @@ end
 
 function IOExtras.closeread(http::Stream{<:Request})
     if incomplete(http)
+        @show http.ntoread, http.readchunked, unknown_length
         # Error if Message is not complete...
         close(http.stream)
         throw(EOFError())

src/clientlayers/ConnectionRequest.jl

@@ -104,11 +104,12 @@ function connectionlayer(handler)
         catch e
             @debugv 1 "❗️  ConnectionLayer $e. Closing: $io"
             shouldreuse = false
+            @try Base.IOError close(io)
             e isa HTTPError || throw(RequestError(req, e))
             rethrow(e)
         finally
             if !shouldreuse
-                @try close(io)
+                @try Base.IOError close(io)
             end
             releaseconnection(io, shouldreuse)
         end

src/clientlayers/StreamRequest.jl

@@ -41,7 +41,7 @@ function streamlayer(stream::Stream; iofunction=nothing, decompress::Union{Nothi
                 catch e
                     # @error "error" exception=(e, catch_backtrace())
                     write_error = e
-                    isopen(io) && @try close(io)
+                    isopen(io) && @try Base.IOError close(io)
                 end
                 @debugv 2 "client startread"
                 startread(stream)
@@ -52,7 +52,7 @@ function streamlayer(stream::Stream; iofunction=nothing, decompress::Union{Nothi
             if isaborted(stream)
                 # The server may have closed the connection.
                 # Don't propagate such errors.
-                @try close(io)
+                @try Base.IOError close(io)
             end
         end
     catch e

test/client.jl

@@ -173,7 +173,7 @@ end
             @test err.error isa EOFError
         finally
             # Shutdown
-            @try close(server)
+            @try Base.IOError close(server)
             HTTP.ConnectionPool.closeall()
         end
     end
@@ -299,7 +299,7 @@ end
                 @test req.status == 200
                 @test String(req.body) == "hello, world"
             finally
-                @try close(server)
+                @try Base.IOError close(server)
                 HTTP.ConnectionPool.closeall()
             end
         end
@@ -337,7 +337,7 @@ end
             @test peer[2] == 8080
         end
     finally
-        @try close(server)
+        @try Base.IOError close(server)
         HTTP.ConnectionPool.closeall()
     end
 
@@ -394,7 +394,7 @@ end
 
         HTTP.setuseragent!(old_user_agent)
     finally
-        @try close(server)
+        @try Base.IOError close(server)
         HTTP.ConnectionPool.closeall()
     end
 end
@@ -435,7 +435,7 @@ import NetworkOptions, MbedTLS
             @test HTTP.get(url; require_ssl_verification=false).status == 200
         end
     finally
-        @try close(server)
+        @try Base.IOError close(server)
         HTTP.ConnectionPool.closeall()
     end
 end
@@ -518,23 +518,22 @@ end
 end
 
 @testset "Retry with request/response body streams" begin
-    server = nothing
-    try
-        shouldfail = Ref(true)
-        server = HTTP.listen!(8080) do http
-            @assert !eof(http)
-            msg = String(readavailable(http))
-            if shouldfail[]
-                shouldfail[] = false
-                error("500 unexpected error")
-            end
-            HTTP.startwrite(http)
-            HTTP.write(http, msg)
+    shouldfail = Ref(true)
+    server = HTTP.listen!(8080) do http
+        @assert !eof(http)
+        msg = String(read(http))
+        if shouldfail[]
+            shouldfail[] = false
+            error("500 unexpected error")
         end
+        HTTP.startwrite(http)
+        HTTP.write(http, msg)
+    end
+    try
         req_body = IOBuffer("hey there sailor")
         seekstart(req_body)
         res_body = IOBuffer()
-        resp = HTTP.get("http://localhost:8080/retry"; body=req_body, response_stream=res_body, verbose=2)
+        resp = HTTP.get("http://localhost:8080/retry"; body=req_body, response_stream=res_body)
         @test resp.status == 200
         @test String(take!(res_body)) == "hey there sailor"
         # ensure if retry=false, that we write the response body immediately
@@ -545,14 +544,13 @@ end
         # when retrying, we can still get access to the most recent failed response body in the response's request context
         shouldfail[] = true
         seekstart(req_body)
+        println("making 3rd request")
         resp = HTTP.get("http://localhost:8080/retry"; body=req_body, response_stream=res_body)
         @test resp.status == 200
         @test String(take!(res_body)) == "hey there sailor"
         @test String(resp.request.context[:response_body]) == "500 unexpected error"
     finally
-        if server !== nothing
-            close(server)
-        end
+        close(server)
         HTTP.ConnectionPool.closeall()
     end
 end