diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-08-12 08:32:46 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-08-12 08:32:46 +0200 |
| commit | b43191903fd7c0f1185f630a436c60dd13b4b1b5 (patch) | |
| tree | 9c32b89fe563c2230095ed31db3ac885185e5c58 /lib/ssl/src/tls_connection.erl | |
| parent | 41d7a8cf3e71975da67116f1cb9f507cebfa734d (diff) | |
| parent | f7583d501470259d4da8a4bfd9da4b2bbf5e3553 (diff) | |
| download | otp-b43191903fd7c0f1185f630a436c60dd13b4b1b5.tar.gz otp-b43191903fd7c0f1185f630a436c60dd13b4b1b5.tar.bz2 otp-b43191903fd7c0f1185f630a436c60dd13b4b1b5.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 2178e8ee09..51551eab11 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -2460,7 +2460,7 @@ do_format_reply(list, _,_, Data) -> binary_to_list(Data). header(0, <<>>) -> - []; + <<>>; header(_, <<>>) -> []; header(0, Binary) -> |