fix that retains streaming

JuliaWeb · Nov 16, 2021 · c0ac2f3 · c0ac2f3
1 parent 080e76b
commit c0ac2f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/StreamRequest.jl b/src/StreamRequest.jl
@@ -145,7 +145,13 @@ function readbody(http::Stream, res::Response, response_stream, reached_redirect
     else
         if reached_redirect_limit || !isredirect(res)
             res.body = body_was_streamed
-            write(response_stream, read(http)) # use read(http) to ensure ntoread is respected
+            if Streams.ntoread(http) == unknown_length
+                write(response_stream, http)
+            else
+                while http.ntoread > 0
+                    readbytes!(http, response_stream, http.ntoread)
+                end
+            end
             close(response_stream)
         end
     end

diff --git a/src/Streams.jl b/src/Streams.jl
@@ -303,6 +303,8 @@ function Base.unsafe_read(http::Stream, p::Ptr{UInt8}, n::UInt)
     nothing
 end
 
+Base.readbytes!(http::Stream, buf::Base.BufferStream, n=bytesavailable(http)) = Base.readbytes!(http, buf.buffer, n)
+
 function Base.readbytes!(http::Stream, buf::IOBuffer, n=bytesavailable(http))
     Base.ensureroom(buf, n)
     unsafe_read(http, pointer(buf.data, buf.size + 1), n)