Skip to content

added max chunk check on recv #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seanmcevoy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added max chunk check on recv #460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/yaws.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2548,14 +2548,24 @@ get_nslookup_pref([], Result) ->
%% http/tcp send receive functions
%%
%%
do_recv(Sock, Num, nossl) ->
gen_tcp:recv(Sock, Num, (get(gc))#gconf.keepalive_timeout);
do_recv(Sock, Num, ssl) ->
ssl:recv(Sock, Num, (get(gc))#gconf.keepalive_timeout).
do_recv(Sock, Num, nossl, Timeout) ->
-define(MaxPacketSize, 8 * 1024 * 1024).

do_recv(Sock, Num, SSL) ->
do_recv(Sock, Num, SSL, (get(gc))#gconf.keepalive_timeout).

do_recv(Sock, Num, nossl, Timeout) when Num =< ?MaxPacketSize ->
gen_tcp:recv(Sock, Num, Timeout);
do_recv(Sock, Num, ssl, Timeout) ->
ssl:recv(Sock, Num, Timeout).
do_recv(Sock, Num, ssl, Timeout) when Num =< ?MaxPacketSize ->
ssl:recv(Sock, Num, Timeout);
do_recv(Sock, Num, SSL, Timeout) when Num > ?MaxPacketSize ->
case do_recv(Sock, ?MaxPacketSize, SSL, Timeout) of
{error, Reason} -> {error, Reason};
{ok, Data1} ->
case do_recv(Sock, Num - ?MaxPacketSize, SSL, Timeout) of
{error, Reason} -> {error, Reason};
{ok, Data2} -> {ok, <<Data1/binary, Data2/binary>>}
end
end.

cli_recv(S, Num, SslBool) ->
Res = do_recv(S, Num, SslBool),
Expand Down