aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_dispatcher.erl4
-rw-r--r--src/cowboy_http_protocol.erl7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/cowboy_dispatcher.erl b/src/cowboy_dispatcher.erl
index d66caf0..d5ce6f7 100644
--- a/src/cowboy_dispatcher.erl
+++ b/src/cowboy_dispatcher.erl
@@ -30,10 +30,10 @@ split_path('*') ->
split_path(Path) ->
case string:chr(Path, $?) of
0 ->
- {string:tokens(Path, "/"), []};
+ {string:tokens(Path, "/"), Path, []};
N ->
{Path2, [$?|Qs]} = lists:split(N - 1, Path),
- {string:tokens(Path2, "/"), Qs}
+ {string:tokens(Path2, "/"), Path2, Qs}
end.
-spec match(Host::path_tokens(), Path::path_tokens(), Dispatch::dispatch())
diff --git a/src/cowboy_http_protocol.erl b/src/cowboy_http_protocol.erl
index 0c7c2c7..1392ea1 100644
--- a/src/cowboy_http_protocol.erl
+++ b/src/cowboy_http_protocol.erl
@@ -64,15 +64,16 @@ request({http_request, _Method, _URI, Version}, State)
%% @todo We need to cleanup the URI properly.
request({http_request, Method, {abs_path, AbsPath}, Version},
State=#state{socket=Socket, transport=Transport}) ->
- {Path, Qs} = cowboy_dispatcher:split_path(AbsPath),
+ {Path, RawPath, Qs} = cowboy_dispatcher:split_path(AbsPath),
{ok, Peer} = Transport:peername(Socket),
wait_header(#http_req{socket=Socket, transport=Transport, method=Method,
- version=Version, peer=Peer, path=Path, raw_qs=Qs}, State);
+ version=Version, peer=Peer, path=Path, raw_path=RawPath, raw_qs=Qs},
+ State);
request({http_request, Method, '*', Version},
State=#state{socket=Socket, transport=Transport}) ->
{ok, Peer} = Transport:peername(Socket),
wait_header(#http_req{socket=Socket, transport=Transport, method=Method,
- version=Version, peer=Peer, path='*', raw_qs=[]}, State);
+ version=Version, peer=Peer, path='*', raw_path="*", raw_qs=[]}, State);
request({http_request, _Method, _URI, _Version}, State) ->
error_terminate(501, State);
request({http_error, "\r\n"}, State) ->