Merge pull request #346 from JuliaWeb/issue_344

fix #344 and #343

src/ConnectionRequest.jl

@@ -44,6 +44,10 @@ function request(::Type{ConnectionPoolLayer{Next}}, url::URI, req, body;
         rethrow(isioerror(e) ? IOError(e, "during request($url)") : e)
     end
 
+    if io.sequence >= reuse_limit
+        defaultheader(req, "Connection" => "close")
+    end
+
     try
         if proxy !== nothing && target_url.scheme == "https"
             return tunnel_request(Next, io, target_url, req, body; kw...)
@@ -56,7 +60,7 @@ function request(::Type{ConnectionPoolLayer{Next}}, url::URI, req, body;
         close(io)
         rethrow(isioerror(e) ? IOError(e, "during request($url)") : e)
     finally
-        if (reuse_limit == 0
+        if (io.sequence >= reuse_limit
         || (proxy !== nothing && target_url.scheme == "https"))
             close(io)
         end

src/Streams.jl

@@ -334,21 +334,24 @@ incomplete(http::Stream) =
 
 function IOExtras.closeread(http::Stream{Response})
 
-    # Discard body bytes that were not read...
-    while !eof(http)
-        readavailable(http)
-    end
-
-    if incomplete(http)
-        # Error if Message is not complete...
-        close(http.stream)
-        throw(EOFError())
-    elseif hasheader(http.message, "Connection", "close")
+    if hasheader(http.message, "Connection", "close")
         # Close conncetion if server sent "Connection: close"...
         @debug 1 "✋  \"Connection: close\": $(http.stream)"
         close(http.stream)
-    elseif isreadable(http.stream)
-        closeread(http.stream)
+    else
+
+        # Discard body bytes that were not read...
+        while !eof(http)
+            readavailable(http)
+        end
+
+        if incomplete(http)
+            # Error if Message is not complete...
+            close(http.stream)
+            throw(EOFError())
+        elseif isreadable(http.stream)
+            closeread(http.stream)
+        end
     end
 
     return http.message