Merge 561b34bd73 into d8c2e5a8da

src/ibrowse_http_client.erl

@@ -235,10 +235,17 @@ handle_info({req_timedout, From}, State) ->
     end;
 
 handle_info(timeout, State) ->
-    do_trace("Inactivity timeout triggered. Shutting down connection~n", []),
-    shutting_down(State),
-    do_error_reply(State, req_timedout),
-    {stop, normal, State};
+    receive
+        {tcp, _Sock, Data} ->
+            handle_sock_data(Data, State);
+        {ssl, _Sock, Data} ->
+            handle_sock_data(Data, State)
+    after 0 ->
+        do_trace("Inactivity timeout triggered. Shutting down connection~n", []),
+        shutting_down(State),
+        do_error_reply(State, req_timedout),
+        {stop, normal, State}
+    end;
 
 handle_info({trace, Bool}, State) ->
     put(my_trace_flag, Bool),