Skip to content

Commit

Permalink
Add the private set_connection/2 function used by cowboy_protocol
Browse files Browse the repository at this point in the history
  • Loading branch information
essen committed Sep 17, 2012
1 parent 350d4ae commit 905083a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
11 changes: 3 additions & 8 deletions src/cowboy_protocol.erl
Expand Up @@ -199,15 +199,10 @@ header({http_header, _I, 'Host', _R, RawHost}, Req,
%% Ignore Host headers if we already have it.
header({http_header, _I, 'Host', _R, _V}, Req, State) ->
parse_header(Req, State);
header({http_header, _I, 'Connection', _R, Connection},
Req=#http_req{headers=Headers}, State=#state{
req_keepalive=Keepalive, max_keepalive=MaxKeepalive})
header({http_header, _I, 'Connection', _R, Connection}, Req,
State=#state{req_keepalive=Keepalive, max_keepalive=MaxKeepalive})
when Keepalive < MaxKeepalive ->
Req2 = Req#http_req{headers=[{'Connection', Connection}|Headers]},
{ok, ConnTokens, Req3}
= cowboy_req:parse_header('Connection', Req2),
ConnAtom = cowboy_http:connection_to_atom(ConnTokens),
parse_header(Req3#http_req{connection=ConnAtom}, State);
parse_header(cowboy_req:set_connection(Connection, Req), State);
header({http_header, _I, Field, _R, Value}, Req, State) ->
Field2 = format_header(Field),
parse_header(Req#http_req{headers=[{Field2, Value}|Req#http_req.headers]},
Expand Down
9 changes: 9 additions & 0 deletions src/cowboy_req.erl
Expand Up @@ -104,6 +104,7 @@

%% Private setter/getter API.
-export([set_host/4]).
-export([set_connection/2]).

%% Misc API.
-export([compact/1]).
Expand Down Expand Up @@ -919,6 +920,14 @@ ensure_response(#http_req{socket=Socket, transport=Transport,
set_host(Host, Port, RawHost, Req=#http_req{headers=Headers}) ->
Req#http_req{host=Host, port=Port, headers=[{'Host', RawHost}|Headers]}.

%% @private
-spec set_connection(binary(), Req) -> Req when Req::req().
set_connection(RawConnection, Req=#http_req{headers=Headers}) ->
Req2 = Req#http_req{headers=[{'Connection', RawConnection}|Headers]},
{ok, ConnTokens, Req3} = parse_header('Connection', Req2),
ConnAtom = cowboy_http:connection_to_atom(ConnTokens),
Req3#http_req{connection=ConnAtom}.

%% Misc API.

%% @doc Compact the request data by removing all non-system information.
Expand Down

0 comments on commit 905083a

Please sign in to comment.