aboutsummaryrefslogtreecommitdiff
path: root/src/tls
diff options
context:
space:
mode:
authorAndreas Köhler <andreas.koehler@1und1.de>2010-10-22 19:51:23 +0200
committerBadlop <badlop@process-one.net>2010-10-26 19:32:15 +0200
commit400fb69f158db9f6236e2143a39cdf8349b392c3 (patch)
tree82c02a0a7948a1b6e34775a8e80f9988c2211982 /src/tls
parentRe-use the TLSSock argument in tls:send/2 (EJAB-1327) (diff)
Ignore Length argument to tls:recv/[23] (EJAB-1327)
The Length argument cannot be used for gen_tcp:recv/3, because the compressed size does not equal the desired uncompressed one.
Diffstat (limited to 'src/tls')
-rw-r--r--src/tls/tls.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tls/tls.erl b/src/tls/tls.erl
index 620f8d30e..46f01b369 100644
--- a/src/tls/tls.erl
+++ b/src/tls/tls.erl
@@ -158,8 +158,10 @@ tls_to_tcp(#tlssock{tcpsock = TCPSocket, tlsport = Port}) ->
recv(Socket, Length) ->
recv(Socket, Length, infinity).
recv(#tlssock{tcpsock = TCPSocket} = TLSSock,
- Length, Timeout) ->
- case gen_tcp:recv(TCPSocket, Length, Timeout) of
+ _Length, Timeout) ->
+ %% The Length argument cannot be used for gen_tcp:recv/3, because the
+ %% compressed size does not equal the desired uncompressed one.
+ case gen_tcp:recv(TCPSocket, 0, Timeout) of
{ok, Packet} ->
recv_data(TLSSock, Packet);
{error, _Reason} = Error ->