aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2011-03-20 00:01:29 +0100
committerLoïc Hoguin <[email protected]>2011-03-20 00:01:29 +0100
commitb874b28561e0e3d626245dee91ac44ad4d8218f1 (patch)
treea548f609376a0cdde3dfa0e5c00290f5c965720e
parent8085529f48dd3a19baf5a4218d462e0afcfedbf9 (diff)
downloadcowboy-b874b28561e0e3d626245dee91ac44ad4d8218f1.tar.gz
cowboy-b874b28561e0e3d626245dee91ac44ad4d8218f1.tar.bz2
cowboy-b874b28561e0e3d626245dee91ac44ad4d8218f1.zip
Save the raw path string in the request.
-rw-r--r--include/http.hrl6
-rw-r--r--src/cowboy_dispatcher.erl4
-rw-r--r--src/cowboy_http_protocol.erl7
3 files changed, 9 insertions, 8 deletions
diff --git a/include/http.hrl b/include/http.hrl
index cff3e67..a36fa93 100644
--- a/include/http.hrl
+++ b/include/http.hrl
@@ -21,9 +21,9 @@
peer = undefined :: undefined | {Address::ip_address(), Port::port_number()},
host = undefined :: undefined | path_tokens(),
raw_host = undefined :: undefined | string(),
- path = undefined :: undefined | path_tokens(), %% todo
- raw_path = undefined :: undefined | string(), %% todo
- qs_vals = undefined :: undefined | bindings(), %% todo
+ path = undefined :: undefined | path_tokens(),
+ raw_path = undefined :: undefined | string(),
+ qs_vals = undefined :: undefined | bindings(),
raw_qs = undefined :: undefined | string(),
bindings = undefined :: undefined | bindings(),
headers = [] :: http_headers()
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) ->