aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-01-22 14:43:43 +0100
committerLoïc Hoguin <[email protected]>2013-01-22 14:43:43 +0100
commitca9184f39ccbebf23a9e635ee24c66d555b4dc79 (patch)
tree99666875a7aad512c66f162302c7939841c06f9f /src
parent3b8a1365d15ef6690160292902cf3fd1fd523fc9 (diff)
parentebadc185c13e8ad2463db8bf8cdb204a9336efc5 (diff)
downloadcowboy-ca9184f39ccbebf23a9e635ee24c66d555b4dc79.tar.gz
cowboy-ca9184f39ccbebf23a9e635ee24c66d555b4dc79.tar.bz2
cowboy-ca9184f39ccbebf23a9e635ee24c66d555b4dc79.zip
Merge branch 'master' of https://github.com/0x00F6/cowboy
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_static.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cowboy_static.erl b/src/cowboy_static.erl
index 530c0f9..2c41c91 100644
--- a/src/cowboy_static.erl
+++ b/src/cowboy_static.erl
@@ -289,7 +289,7 @@ forbidden(Req, #state{fileinfo={ok, #file_info{access=Access}}}=State) ->
-spec last_modified(Req, #state{})
-> {calendar:datetime(), Req, #state{}} when Req::cowboy_req:req().
last_modified(Req, #state{fileinfo={ok, #file_info{mtime=Modified}}}=State) ->
- {Modified, Req, State}.
+ {erlang:localtime_to_universaltime(Modified), Req, State}.
%% @private Generate the ETag header value for this file.