diff options
| author | Loïc Hoguin <[email protected]> | 2011-05-16 12:08:55 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2011-05-16 12:08:55 +0200 |
| commit | 98b9b1124ca96655a774259e3f18693161f42cfa (patch) | |
| tree | e874d05a3b738ea45315d0fb9a53d8922fa4b2b5 /src/cowboy_http_protocol.erl | |
| parent | 9f06bac7bff3c8a8edbd90e3de80792c45c03578 (diff) | |
| parent | 4e09d776f5368f432971429f9868052f55151555 (diff) | |
| download | cowboy-98b9b1124ca96655a774259e3f18693161f42cfa.tar.gz cowboy-98b9b1124ca96655a774259e3f18693161f42cfa.tar.bz2 cowboy-98b9b1124ca96655a774259e3f18693161f42cfa.zip | |
Merge remote-tracking branch 'nox/path-info'
Diffstat (limited to 'src/cowboy_http_protocol.erl')
| -rw-r--r-- | src/cowboy_http_protocol.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cowboy_http_protocol.erl b/src/cowboy_http_protocol.erl index 302df26..ed4d963 100644 --- a/src/cowboy_http_protocol.erl +++ b/src/cowboy_http_protocol.erl @@ -1,4 +1,5 @@ %% Copyright (c) 2011, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011, Anthony Ramine <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above @@ -158,8 +159,9 @@ dispatch(Req=#http_req{host=Host, path=Path}, %% @todo We probably want to filter the Host and Path here to allow %% things like url rewriting. case cowboy_dispatcher:match(Host, Path, Dispatch) of - {ok, Handler, Opts, Binds} -> - parse_header(Req#http_req{bindings=Binds}, + {ok, Handler, Opts, Binds, HostInfo, PathInfo} -> + parse_header(Req#http_req{host_info=HostInfo, path_info=PathInfo, + bindings=Binds}, State#state{handler={Handler, Opts}}); {error, notfound, host} -> error_terminate(400, State); |