umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-15 04:30:25 +00:00
Code Issues Wiki Activity

Fix bad accounting of HTTP/2 windows

Browse source 
The previous code was incorrectly substracting the maximum
frame size we could send when the data we were actually sending
was much lower.
This commit is contained in:
Loïc Hoguin 2017-05-31 12:49:21 +02:00
parent 18e2d684b3
commit cad3e3f63d
No known key found for this signature in database
GPG key ID: 71366FF21851DF03
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/cowboy_http2.erl
View file

@ -633,31 +633,31 @@ send_data(State=#state{local_window=ConnWindow},
send_data(State=#state{socket=Socket, transport=Transport, local_window=ConnWindow}, send_data(State=#state{socket=Socket, transport=Transport, local_window=ConnWindow},
Stream=#stream{id=StreamID, local_window=StreamWindow}, IsFin, Data) -> Stream=#stream{id=StreamID, local_window=StreamWindow}, IsFin, Data) ->
MaxFrameSize = 16384, %% @todo Use the real SETTINGS_MAX_FRAME_SIZE set by the client. MaxFrameSize = 16384, %% @todo Use the real SETTINGS_MAX_FRAME_SIZE set by the client.
SendSize = min(min(ConnWindow, StreamWindow), MaxFrameSize), MaxSendSize = min(min(ConnWindow, StreamWindow), MaxFrameSize),
case Data of case Data of
{sendfile, Offset, Bytes, Path} when Bytes =< SendSize -> {sendfile, Offset, Bytes, Path} when Bytes =< MaxSendSize ->
Transport:send(Socket, cow_http2:data_header(StreamID, IsFin, Bytes)), Transport:send(Socket, cow_http2:data_header(StreamID, IsFin, Bytes)),
Transport:sendfile(Socket, Path, Offset, Bytes), Transport:sendfile(Socket, Path, Offset, Bytes),
{State#state{local_window=ConnWindow - SendSize}, {State#state{local_window=ConnWindow - Bytes},
Stream#stream{local=IsFin, local_window=StreamWindow - SendSize}}; Stream#stream{local=IsFin, local_window=StreamWindow - Bytes}};
{sendfile, Offset, Bytes, Path} -> {sendfile, Offset, Bytes, Path} ->
Transport:send(Socket, cow_http2:data_header(StreamID, nofin, SendSize)), Transport:send(Socket, cow_http2:data_header(StreamID, nofin, MaxSendSize)),
Transport:sendfile(Socket, Path, Offset, SendSize), Transport:sendfile(Socket, Path, Offset, MaxSendSize),
send_data(State#state{local_window=ConnWindow - SendSize}, send_data(State#state{local_window=ConnWindow - MaxSendSize},
Stream#stream{local_window=StreamWindow - SendSize}, Stream#stream{local_window=StreamWindow - MaxSendSize},
IsFin, {sendfile, Offset + SendSize, Bytes - SendSize, Path}); IsFin, {sendfile, Offset + MaxSendSize, Bytes - MaxSendSize, Path});
Iolist0 -> Iolist0 ->
IolistSize = iolist_size(Iolist0), IolistSize = iolist_size(Iolist0),
if if
IolistSize =< SendSize -> IolistSize =< MaxSendSize ->
Transport:send(Socket, cow_http2:data(StreamID, IsFin, Iolist0)), Transport:send(Socket, cow_http2:data(StreamID, IsFin, Iolist0)),
{State#state{local_window=ConnWindow - SendSize}, {State#state{local_window=ConnWindow - IolistSize},
Stream#stream{local=IsFin, local_window=StreamWindow - SendSize}}; Stream#stream{local=IsFin, local_window=StreamWindow - IolistSize}};
true -> true ->
{Iolist, More} = cowboy_iolists:split(SendSize, Iolist0), {Iolist, More} = cowboy_iolists:split(MaxSendSize, Iolist0),
Transport:send(Socket, cow_http2:data(StreamID, nofin, Iolist)), Transport:send(Socket, cow_http2:data(StreamID, nofin, Iolist)),
send_data(State#state{local_window=ConnWindow - SendSize}, send_data(State#state{local_window=ConnWindow - MaxSendSize},
Stream#stream{local_window=StreamWindow - SendSize}, Stream#stream{local_window=StreamWindow - MaxSendSize},
IsFin, More) IsFin, More)
end end
end. end.