umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 20:30:23 +00:00
Code Issues Wiki Activity

Merge branch 'read_with_utc' of git://github.com/narma/cowboy

Browse source
This commit is contained in:
Loïc Hoguin 2013-06-07 19:07:38 +02:00
commit 830d4c85c8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cowboy_static.erl
View file

@ -233,7 +233,7 @@ rest_init(Req, Opts) ->
end. end.
rest_init(Req, Opts, Filepath) -> rest_init(Req, Opts, Filepath) ->
Fileinfo = file:read_file_info(Filepath), Fileinfo = file:read_file_info(Filepath, [{time, universal}]),
Mimetypes = case lists:keyfind(mimetypes, 1, Opts) of Mimetypes = case lists:keyfind(mimetypes, 1, Opts) of
false -> {fun path_to_mimetypes/2, []}; false -> {fun path_to_mimetypes/2, []};
{_, {{M, F}, E}} -> {fun M:F/2, E}; {_, {{M, F}, E}} -> {fun M:F/2, E};
@ -290,7 +290,7 @@ forbidden(Req, #state{fileinfo={ok, #file_info{access=Access}}}=State) ->
-spec last_modified(Req, #state{}) -spec last_modified(Req, #state{})
-> {calendar:datetime(), Req, #state{}} when Req::cowboy_req:req(). -> {calendar:datetime(), Req, #state{}} when Req::cowboy_req:req().
last_modified(Req, #state{fileinfo={ok, #file_info{mtime=Modified}}}=State) -> last_modified(Req, #state{fileinfo={ok, #file_info{mtime=Modified}}}=State) ->
{erlang:localtime_to_universaltime(Modified), Req, State}. {Modified, Req, State}.
%% @private Generate the ETag header value for this file. %% @private Generate the ETag header value for this file.
%% The ETag header value is only generated if the resource is a file that %% The ETag header value is only generated if the resource is a file that