aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-08-12 08:32:03 +0200
committerIngela Anderton Andin <[email protected]>2013-08-12 08:32:03 +0200
commitf7583d501470259d4da8a4bfd9da4b2bbf5e3553 (patch)
treebf100f08eeeb8b259c24b44767fb44c8d3f6ec49 /lib/ssl/src
parent1bfd85e41f4fb4e3f445fb44c76231667ee27c17 (diff)
parent50d7d2f939a7c5e1aa12c6404363faf4a28aa9e8 (diff)
downloadotp-f7583d501470259d4da8a4bfd9da4b2bbf5e3553.tar.gz
otp-f7583d501470259d4da8a4bfd9da4b2bbf5e3553.tar.bz2
otp-f7583d501470259d4da8a4bfd9da4b2bbf5e3553.zip
Merge branch 'ia/ssl/header-bug/OTP-11230' into maint
* ia/ssl/header-bug/OTP-11230: ssl: Revert faulty header option fix
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/tls_connection.erl2
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) ->