aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/tls_connection.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-08-08 11:07:23 +0200
committerIngela Anderton Andin <[email protected]>2013-08-08 11:07:23 +0200
commit50d7d2f939a7c5e1aa12c6404363faf4a28aa9e8 (patch)
treea377911e50403b88eecec666180f38d863cd2b90 /lib/ssl/src/tls_connection.erl
parent3021fca734f71f8bae966ab67f1400d37f8927bc (diff)
downloadotp-50d7d2f939a7c5e1aa12c6404363faf4a28aa9e8.tar.gz
otp-50d7d2f939a7c5e1aa12c6404363faf4a28aa9e8.tar.bz2
otp-50d7d2f939a7c5e1aa12c6404363faf4a28aa9e8.zip
ssl: Revert faulty header option fix
The code was changed in the belife that it made it inet compatible. However the testing is a bit hairy as the inet option is acctualy broken, now the tests are corrected and the header option should work in the same broken way as inet again, preferably use the bitsyntax instead.
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
-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 246fecf34a..edbba94865 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -2458,7 +2458,7 @@ do_format_reply(list, _,_, Data) ->
binary_to_list(Data).
header(0, <<>>) ->
- [];
+ <<>>;
header(_, <<>>) ->
[];
header(0, Binary) ->