File hackney-1.18.1-git.patch of Package hackney

Overview Repositories Revisions Requests Users Attributes Meta

File hackney-1.18.1-git.patch of Package hackney (Revision e5fd9b9ce24a146dd5bf81b8a37cbe96)

Currently displaying revision e5fd9b9ce24a146dd5bf81b8a37cbe96 , Show latest

diff --git a/rebar.config b/rebar.config
index ae519f9..4a46f8a 100644
--- a/rebar.config
+++ b/rebar.config
@@ -23,9 +23,9 @@
 {deps, [
         {idna, "~>6.1.0"},
         {mimerl, "~>1.1"},
-        {certifi, "~>2.9.0"},
+        {certifi, "~>2.11.0"},
         {metrics, "~>1.0.0"},
-        {parse_trans, "3.3.1"},
+        {parse_trans, "3.4.1"},
         {ssl_verify_fun, "~>1.1.0"},
         {unicode_util_compat, "~>0.7.0"}
        ]}.
diff --git a/rebar.lock b/rebar.lock
index 34397ef..4b384f3 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,26 +1,26 @@
 {"1.2.0",
-[{<<"certifi">>,{pkg,<<"certifi">>,<<"2.9.0">>},0},
+[{<<"certifi">>,{pkg,<<"certifi">>,<<"2.11.0">>},0},
  {<<"idna">>,{pkg,<<"idna">>,<<"6.1.1">>},0},
  {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},0},
  {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},0},
- {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.1">>},0},
+ {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.4.1">>},0},
  {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},0},
  {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},0}]}.
 [
 {pkg_hash,[
- {<<"certifi">>, <<"6F2A475689DD47F19FB74334859D460A2DC4E3252A3324BD2111B8F0429E7E21">>},
+ {<<"certifi">>, <<"5ADFE37CEB8569D019F836944AEAF27F8AC391DACAF3707F570C155B7E03AAA8">>},
  {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>},
  {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
  {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
- {<<"parse_trans">>, <<"16328AB840CC09919BD10DAB29E431DA3AF9E9E7E7E6F0089DD5A2D2820011D8">>},
+ {<<"parse_trans">>, <<"6E6AA8167CB44CC8F39441D05193BE6E6F4E7C2946CB2759F015F8C56B76E5FF">>},
  {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
  {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]},
 {pkg_hash_ext,[
- {<<"certifi">>, <<"266DA46BDB06D6C6D35FDE799BCB28D36D985D424AD7C08B5BB48F5B5CDD4641">>},
+ {<<"certifi">>, <<"9E37E0542EC3FABAA19A0734B3900DC095797FAC48C40A2A9741D8AD5E3C9BB7">>},
  {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>},
  {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
  {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},
- {<<"parse_trans">>, <<"07CD9577885F56362D414E8C4C4E6BDF10D43A8767ABB92D24CBE8B24C54888B">>},
+ {<<"parse_trans">>, <<"620A406CE75DADA827B82E453C19CF06776BE266F5A67CFF34E1EF2CBB60E49A">>},
  {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
  {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>}]}
 ].
diff --git a/src/hackney.app.src b/src/hackney.app.src
index a0fd492..fd35ce1 100644
--- a/src/hackney.app.src
+++ b/src/hackney.app.src
@@ -28,7 +28,7 @@
       {maxr, 10},
       {maxt, 1}]},
 
-    {licenses, ["Apache 2.0"]},
+    {licenses, ["Apache-2.0"]},
     {links, [{"Github", "https://github.com/benoitc/hackney"}]},
     {files, [
       "src",
diff --git a/src/hackney.erl b/src/hackney.erl
index 04b5f50..e25a937 100644
--- a/src/hackney.erl
+++ b/src/hackney.erl
@@ -725,7 +725,7 @@ maybe_redirect(
   case redirect_location(Headers) of
     undefined -> Resp;
     Location ->
-      IsRedirect = lists:member(S, [301, 302, 303, 307]),
+      IsRedirect = lists:member(S, [301, 302, 303, 307, 308]),
       case IsRedirect of
         false -> Resp;
         _ ->
@@ -734,7 +734,7 @@ maybe_redirect(
       end
   end;
 maybe_redirect({ok, S, _H, #client{follow_redirect=true}}=Resp, _Req) ->
-  case lists:member(S, [301, 302, 303, 307]) of
+  case lists:member(S, [301, 302, 303, 307, 308]) of
     true ->
       {error, {max_redirect_overflow, Resp}};
     false ->
@@ -746,7 +746,7 @@ maybe_redirect(Resp, _Req) ->
 
 maybe_redirect1(Location, {ok, S, H, #client{retries=Tries}=Client}=Resp, Req) ->
   {Method, _Path, Headers, Body} = Req,
-  case lists:member(S, [301, 302, 307]) of
+  case lists:member(S, [301, 302, 307, 308]) of
     true  ->
       ?report_debug("redirect request", [{location, Location},
                                          {req, Req},
diff --git a/src/hackney_connect.erl b/src/hackney_connect.erl
index c39275c..5940a02 100644
--- a/src/hackney_connect.erl
+++ b/src/hackney_connect.erl
@@ -229,6 +229,11 @@ socket_from_pool(Host, Port, Transport, Client0) ->
       Client1 = Client#client{socket_ref=Ref, pool_handler=PoolHandler},
 
       do_connect(Host, Port, Transport, Client1, pool);
+    {error, timeout} ->
+      ?report_trace("connect timeout", []),
+      _ = metrics:increment_counter(Metrics, [hackney, Host, connect_timeout]),
+      hackney_manager:cancel_request(Client),
+      {error, connect_timeout};
     Error ->
       ?report_trace("connect error", []),
       _ = metrics:increment_counter(Metrics, [hackney, Host, connect_error]),
diff --git a/src/hackney_connection.erl b/src/hackney_connection.erl
index 76ba3c3..3dc95a6 100644
--- a/src/hackney_connection.erl
+++ b/src/hackney_connection.erl
@@ -98,6 +98,9 @@ new_connection_r(Transport, Host, Port, Id, Tunnel) ->
               tunnel=Tunnel}.
 
 
+connect_options(hackney_local_tcp, _Host, ClientOptions) ->
+  proplists:get_value(connect_options, ClientOptions, []);
+
 connect_options(Transport, Host, ClientOptions) ->
   ConnectOpts0 = proplists:get_value(connect_options, ClientOptions, []),
 
@@ -162,4 +165,3 @@ maybe_tunnel(hackney_http_connect) ->
   true;
 maybe_tunnel(_) ->
   false.
-
diff --git a/src/hackney_http.erl b/src/hackney_http.erl
index c1018cc..1f6fc1d 100644
--- a/src/hackney_http.erl
+++ b/src/hackney_http.erl
@@ -384,6 +384,8 @@ transfer_decode(Data, St=#hparser{
       {ok, Chunk, St#hparser{buffer=Rest}};
     more ->
       {more, St#hparser{buffer=Data}, Buf};
+    {more, TransferState2} ->
+      {more, St#hparser{buffer=Data, body_state={stream, TransferDecode, TransferState2, ContentDecode}}, Buf};
     {done, Rest} ->
       {done, Rest};
     {done, Data2, _Rest} ->
@@ -424,7 +426,7 @@ te_chunked(Data, _) ->
         {ok, Chunk, Rest1} ->
           {chunk_ok, Chunk, Rest1};
         eof ->
-          more
+          {more, {byte_size(Rest), Size}}
       end;
     eof ->
       more
diff --git a/src/hackney_response.erl b/src/hackney_response.erl
index 2241fc2..57c0edd 100644
--- a/src/hackney_response.erl
+++ b/src/hackney_response.erl
@@ -9,6 +9,7 @@
 -module(hackney_response).
 
 -include("hackney.hrl").
+-include("hackney_lib.hrl").
 
 -type response_state() :: start | waiting | on_status | on_headers | on_body.
 -export_type([response_state/0]).
@@ -165,8 +166,8 @@ stream_body1(Error, _Client) ->
 
 -spec stream_body_recv(binary(), #client{})
     -> {ok, binary(), #client{}} | {error, term()}.
-stream_body_recv(Buffer, Client=#client{version=Version, clen=CLen}) ->
-  case recv(Client) of
+stream_body_recv(Buffer, Client=#client{version=Version, clen=CLen, parser=#hparser{body_state={stream, _, TransferState, _}}}) ->
+  case recv(Client, TransferState) of
     {ok, Data} ->
       stream_body(Data, Client);
     {error, Reason} ->
@@ -347,6 +348,11 @@ maybe_close(#client{version={Min,Maj}, headers=Headers, clen=CLen}) ->
 recv(#client{transport=Transport, socket=Skt, recv_timeout=Timeout}) ->
   Transport:recv(Skt, 0, Timeout).
 
+recv(#client{transport=Transport, socket=Skt, recv_timeout=Timeout}, {_BufSize, undefined}) ->
+  Transport:recv(Skt, 0, Timeout);
+recv(#client{transport=Transport, socket=Skt, recv_timeout=Timeout}, {BufSize, ExpectedSize}) ->
+  Transport:recv(Skt, ExpectedSize - BufSize, Timeout).
+
 close(#client{socket=nil}=Client) ->
   Client#client{state = closed};
 close(#client{transport=Transport, socket=Skt}=Client) ->
diff --git a/src/hackney_stream.erl b/src/hackney_stream.erl
index 7df666d..c8bc2a5 100644
--- a/src/hackney_stream.erl
+++ b/src/hackney_stream.erl
@@ -170,7 +170,7 @@ maybe_redirect(Parent, Owner, Ref, StatusInt, Reason,
                        socket=Socket,
                        method=Method,
                        follow_redirect=true}=Client) ->
-  case lists:member(StatusInt, [301, 302, 307]) of
+  case lists:member(StatusInt, [301, 302, 307, 308]) of
     true ->
       Transport:setopts(Socket, [{active, false}]),
       case parse(Client) of
diff --git a/test/hackney_pool_tests.erl b/test/hackney_pool_tests.erl
index 4df20a3..dd1569b 100644
--- a/test/hackney_pool_tests.erl
+++ b/test/hackney_pool_tests.erl
@@ -9,7 +9,8 @@ dummy_test() ->
 multipart_test_() ->
     {setup, fun start/0, fun stop/1,
       [{timeout, 120, queue_timeout()},
-       {timeout, 120, checkout_timeout()}]}.
+       {timeout, 120, checkout_timeout()},
+       {timeout, 120, connect_timeout()}]}.
 
 start() ->
     error_logger:tty(false),
@@ -57,3 +58,14 @@ checkout_timeout() ->
                 ?assertEqual(Error, checkout_timeout)
         end
     end.
+
+connect_timeout() ->
+    fun() ->
+        URL = <<"http://localhost:8123/pool">>,
+        Headers = [],
+        Opts = [{max_body, 2048}, {pool, pool_test}, {connect_timeout, 1}],
+        case hackney:request(post, URL, Headers, stream, Opts) of
+            {error, Error} ->
+                ?assertEqual(Error, connect_timeout)
+        end
+    end.

Places

File hackney-1.18.1-git.patch of Package hackney (Revision e5fd9b9ce24a146dd5bf81b8a37cbe96)

Places