From fd061264cfeb5c2ee8beb957d15136bd3408dc97 Mon Sep 17 00:00:00 2001 From: Iain Dunning Date: Sat, 20 Sep 2014 12:07:00 -0400 Subject: [PATCH 1/3] Fix now(UTC) issue --- src/HttpCommon.jl | 2 +- test/runtests.jl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/HttpCommon.jl b/src/HttpCommon.jl index 2312b5b..d1379c1 100644 --- a/src/HttpCommon.jl +++ b/src/HttpCommon.jl @@ -125,7 +125,7 @@ const HttpMethodBitmaskToName = (HttpMethodBitmask => String)[v => k for (k, v) RFC1123_datetime(t::DateTime) = begin Dates.format(t, Dates.RFC1123Format) * " GMT" end -RFC1123_datetime() = RFC1123_datetime(Dates.now(Dates.UTC)) +RFC1123_datetime() = RFC1123_datetime(Dates.nowutc()) # HTTP Headers # diff --git a/test/runtests.jl b/test/runtests.jl index 81d0f73..1c9dda6 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -34,4 +34,7 @@ facts("HttpCommon utility functions") do ["foo" => "barrun&++", "bar" => "123"] end -end \ No newline at end of file +end + +# Check doesn't throw +RFC1123_datetime() \ No newline at end of file From d1e98bf78421453c8c8adcaed9c1ae17fd016ceb Mon Sep 17 00:00:00 2001 From: Iain Dunning Date: Sat, 20 Sep 2014 12:21:29 -0400 Subject: [PATCH 2/3] Old behaviour --- src/HttpCommon.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HttpCommon.jl b/src/HttpCommon.jl index d1379c1..2312b5b 100644 --- a/src/HttpCommon.jl +++ b/src/HttpCommon.jl @@ -125,7 +125,7 @@ const HttpMethodBitmaskToName = (HttpMethodBitmask => String)[v => k for (k, v) RFC1123_datetime(t::DateTime) = begin Dates.format(t, Dates.RFC1123Format) * " GMT" end -RFC1123_datetime() = RFC1123_datetime(Dates.nowutc()) +RFC1123_datetime() = RFC1123_datetime(Dates.now(Dates.UTC)) # HTTP Headers # From f8a37bb2acce93ac44344a797d49d7337325bd32 Mon Sep 17 00:00:00 2001 From: Iain Dunning Date: Sat, 20 Sep 2014 12:25:08 -0400 Subject: [PATCH 3/3] Now with more if --- src/HttpCommon.jl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/HttpCommon.jl b/src/HttpCommon.jl index 2312b5b..0c1d25e 100644 --- a/src/HttpCommon.jl +++ b/src/HttpCommon.jl @@ -125,7 +125,12 @@ const HttpMethodBitmaskToName = (HttpMethodBitmask => String)[v => k for (k, v) RFC1123_datetime(t::DateTime) = begin Dates.format(t, Dates.RFC1123Format) * " GMT" end -RFC1123_datetime() = RFC1123_datetime(Dates.now(Dates.UTC)) +if VERSION < v"0.4-" + RFC1123_datetime() = RFC1123_datetime(Dates.nowutc()) +else + RFC1123_datetime() = RFC1123_datetime(Dates.now(Dates.UTC)) +end + # HTTP Headers #