From a5b3d81936ab85edb8713f29baf85307ae0b25b8 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Fri, 25 Nov 2011 20:29:59 +0100
Subject: Preliminary work on header/trailer

Have to figure out how to represent progress in header writing when
using non-blocking, not sure how to do this.
---
 lib/kernel/src/gen_tcp.erl            | 14 ++++++++------
 lib/kernel/test/gen_tcp_api_SUITE.erl |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index 2eaa44b966..78e3ab3697 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -327,7 +327,7 @@ unrecv(S, Data) when is_port(S) ->
 sendfile(File, _Sock, _Offet, _Bytes, _Opts) when is_pid(File) ->
     {error, badarg};
 sendfile(File, Sock, Offset, Bytes, []) ->
-    sendfile(File, Sock, Offset, Bytes, ?MAX_CHUNK_SIZE, undefined, undefined,
+    sendfile(File, Sock, Offset, Bytes, ?MAX_CHUNK_SIZE, [], [],
 	     false, false, false);
 sendfile(File, Sock, Offset, Bytes, Opts) ->
     ChunkSize0 = proplists:get_value(chunk_size, Opts, ?MAX_CHUNK_SIZE),
@@ -335,8 +335,8 @@ sendfile(File, Sock, Offset, Bytes, Opts) ->
 			?MAX_CHUNK_SIZE;
 		   true -> ChunkSize0
 		end,
-    Headers = proplists:get_value(headers, Opts),
-    Trailers = proplists:get_value(trailers, Opts),
+    Headers = proplists:get_value(headers, Opts, []),
+    Trailers = proplists:get_value(trailers, Opts, []),
     sendfile(File, Sock, Offset, Bytes, ChunkSize, Headers, Trailers,
 	     lists:member(sf_nodiskio,Opts),lists:member(sf_mnowait,Opts),
 	     lists:member(sf_sync,Opts)).
@@ -432,11 +432,13 @@ sendfile(_,_,_,_,_,_,_,_,_,_) ->
 %%%
 sendfile_fallback(File, Sock, Offset, Bytes, ChunkSize,
 		  Headers, Trailers)
-  when is_list(Headers) == false ->
+  when Headers == []; is_integer(Headers) ->
     case sendfile_fallback(File, Sock, Offset, Bytes, ChunkSize) of
-	{ok, BytesSent} when is_list(Trailers),is_integer(Headers) ->
+	{ok, BytesSent} when is_list(Trailers),
+			     Trailers =/= [],
+			     is_integer(Headers) ->
 	    sendfile_send(Sock, Trailers, BytesSent+Headers);
-	{ok, BytesSent} when is_list(Trailers) ->
+	{ok, BytesSent} when is_list(Trailers), Trailers =/= [] ->
 	    sendfile_send(Sock, Trailers, BytesSent);
 	{ok, BytesSent} when is_integer(Headers) ->
 	    {ok, BytesSent + Headers};
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 876d266c4b..d66caad2d8 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -370,7 +370,7 @@ t_sendfile_hdtl(Config) ->
 	   end,
 
     SendHdTl = fun(Sock) ->
-		       Headers = [<<"header1">>,"header2"],
+		       Headers = [<<"header1">>,<<0:(1024*8)>>,"header2"],
 		       Trailers = [<<"trailer1">>,"trailer2"],
 		       D = Send(Sock,Headers,Trailers,
 			    iolist_size([Headers,Trailers])),
-- 
cgit v1.2.3