[crary PATCH] use gtime for generating rfc1123 strings

[Scott R Parish]

---
ebin/crary.app | 5 +++--
src/crary.erl | 7 ++++---
src/crary_util.erl | 39 +--------------------------------------
3 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/ebin/crary.app b/ebin/crary.app
index eb982b0..cd5009b 100644
--- a/ebin/crary.app
+++ b/ebin/crary.app
@@ -14,8 +14,9 @@
crary_util
]},
{registered,[crary_sup]},
- {applications, [kernel, stdlib, sasl, uri]},
- {versioned_dependencies, [{uri, "0.1.0", gte}]},
+ {applications, [kernel, stdlib, sasl, uri, gtime]},
+ {versioned_dependencies, [{uri, "0.1.0", gte},
+ {gtime, "0.9.4", gte}]},
{mod, {crary_app,[]}},
{start_phases, []}]}.

diff --git a/src/crary.erl b/src/crary.erl
index 94fafe5..c95f150 100644
--- a/src/crary.erl
+++ b/src/crary.erl
@@ -446,9 +446,10 @@ resp(Req, Code, Headers, BodyOrF) ->
%% @spec (crary_req(), code(), crary_headers:headers()) -> ok
r(Req, Code, Headers) ->
crary_sock:write_resp_line(Req, Code),
- Headers2 = crary_headers:extend([{<<"server">>, ident(Req)},
- {<<"date">>, crary_util:rfc1123_date()}],
- Headers),
+ Headers2 = crary_headers:extend(
+ [{<<"server">>, ident(Req)},
+ {<<"date">>, gtime:gtostr(gtime:gnow(), rfc1123)}],
+ Headers),
crary_headers:write(Req, Headers2).

%% @doc Alias for {@link r/3}
diff --git a/src/crary_util.erl b/src/crary_util.erl
index aa675d9..349725b 100644
--- a/src/crary_util.erl
+++ b/src/crary_util.erl
@@ -29,44 +29,7 @@
%%% a completely seperate library
-module(crary_util).

--export([rfc1123_date/0, rfc1123_date/1, spawn_link/1]).
-
-%% @doc Return a date string for "now" in the format specified by RFC1123.
-%% @spec () -> iolist()
-rfc1123_date() ->
- rfc1123_date(calendar:universal_time()).
-
-%% @doc Return a date string in the format specified by RFC1123.
-%% The time should be passed to this module in the same format the
-%% {@link calendar} module uses.
-%% @spec (calendar()) -> iolist()
-rfc1123_date({{Y, M, D} = Date, {H, N, S}}) ->
- io_lib:format("~s, ~.2.0w ~s ~b ~.2.0w:~.2.0w:~.2.0w GMT",
- [dow_name(Date), D, moy_name(M), Y, H, N, S]).
-
-dow_name(Date) ->
- case calendar:day_of_the_week(Date) of
- 1 -> <<"Mon">>;
- 2 -> <<"Tue">>;
- 3 -> <<"Wed">>;
- 4 -> <<"Thu">>;
- 5 -> <<"Fri">>;
- 6 -> <<"Sat">>;
- 7 -> <<"Sun">>
- end.
-
-moy_name(1) -> <<"Jan">>;
-moy_name(2) -> <<"Feb">>;
-moy_name(3) -> <<"Mar">>;
-moy_name(4) -> <<"Apr">>;
-moy_name(5) -> <<"May">>;
-moy_name(6) -> <<"Jun">>;
-moy_name(7) -> <<"Jul">>;
-moy_name(8) -> <<"Aug">>;
-moy_name(9) -> <<"Sep">>;
-moy_name(10) -> <<"Oct">>;
-moy_name(11) -> <<"Nov">>;
-moy_name(12) -> <<"Dec">>.
+-export([spawn_link/1]).

%% @doc proc_lib:spawn_link() doesn't detect uncaught throws, do so and
%% return them in a form it will detect and handle
--
1.5.3.7