Changes to maintain compatibility with latest updates in Cowboy

Author: amiramix

README.md

@@ -1,4 +1,5 @@
 charreada
 =========
 
-Simple Erlang reverse proxy leveraging Cowboy
+Simple Erlang reverse proxy leveraging Cowboy and iBrowse.
+

src/charreada.erl

@@ -7,7 +7,7 @@
 start_http_proxy(NbAcceptors, TransOpts, Timeout) ->
     Dispatch = [{'_', [ {'_', charreada_handler, []} ]} ],
     Fun = fun(Req) -> charreada_handler:onrequest(Req, Timeout) end,
-    ProtoOpts = [ {dispatch, Dispatch}, {onrequest, Fun} ],
+    ProtoOpts = [ {env, [{dispatch, Dispatch}]}, {onrequest, Fun} ],
     {ok, _} = cowboy:start_http(http, NbAcceptors, TransOpts, ProtoOpts),
     ok.
 

src/charreada_handler.erl

@@ -37,8 +37,10 @@ info({ibrowse_get_body, Pid}, Req, State) ->
     stream(cowboy_req:stream_body(Req), Req, Pid, State);
 info({ibrowse_async_headers, RequestId, Code, HeadersOrg}, Req, {Timeout, undefined}) ->
     {Headers, Length} = process_headers(HeadersOrg, [], 0),
-    {ok, Transport, Socket} = cowboy_req:transport(Req),
-    Fun = fun() -> stream_reply({RequestId, Transport, Socket, Length}, Length) end,
+    Fun =
+        fun(Socket, Transport) ->
+                stream_reply({RequestId, Transport, Socket, Length}, Length)
+        end,
     {ok, ReplyReq} = cowboy_req:reply(list_to_integer(Code), Headers, {Length, Fun}, Req),
     {loop, ReplyReq, {Timeout, Length}};
 info({ibrowse_async_response, _RequestId, []}, Req, State) ->