This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-server".
The branch, master has been updated
via 7ee15e59949f568f8a9b7b9359c7667b7016b80b (commit)
via fa804d585de4444d40a08b2e3dea3fa1b454e0f6 (commit)
from 446969dd3d11d925f519f238820c56dfd4e6604f (commit)
Summary of changes:
.mailmap | 1 +
CONTRIBUTORS | 2 +-
snap-server.cabal | 2 +-
src/Snap/Internal/Http/Server/Date.hs | 16 +---------------
test/snap-server-testsuite.cabal | 2 +-
5 files changed, 5 insertions(+), 18 deletions(-)
create mode 100644 .mailmap
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7ee15e59949f568f8a9b7b9359c7667b7016b80b
Author: Jacob Stanley <[email protected]>
Date: Fri Oct 15 00:40:08 2010 +0800
Changed my email address
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..123c57c
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Jacob Stanley <[email protected]> <[email protected]>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index cc14685..85fa22d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3,4 +3,4 @@ Gregory Collins <[email protected]>
Shu-yu Guo <[email protected]>
Carl Howells <[email protected]>
James Sanders <[email protected]>
-Jacob Stanley <[email protected]>
+Jacob Stanley <[email protected]>
commit fa804d585de4444d40a08b2e3dea3fa1b454e0f6
Author: Jacob Stanley <[email protected]>
Date: Fri Oct 15 00:33:03 2010 +0800
Portable epochTime is now available in unix-compat
diff --git a/snap-server.cabal b/snap-server.cabal
index 533c3cb..35296b7 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -128,7 +128,7 @@ Library
time,
transformers,
utf8-string,
- unix-compat,
+ unix-compat == 0.2.*,
vector >= 0.6 && <0.7
if flag(portable) || os(windows)
diff --git a/src/Snap/Internal/Http/Server/Date.hs
b/src/Snap/Internal/Http/Server/Date.hs
index f2ca25c..3d68f1b 100644
--- a/src/Snap/Internal/Http/Server/Date.hs
+++ b/src/Snap/Internal/Http/Server/Date.hs
@@ -14,12 +14,7 @@ import Data.IORef
import Data.Maybe
import Foreign.C.Types
import System.IO.Unsafe
-
-#ifndef PORTABLE
-import System.Posix.Time
-#else
-import Data.Time.Clock.POSIX
-#endif
+import System.PosixCompat.Time
import Snap.Internal.Http.Types (formatHttpTime, formatLogTime)
@@ -62,15 +57,6 @@ dateState = unsafePerformIO $ do
return d
-#ifdef PORTABLE
-------------------------------------------------------------------------------
-epochTime :: IO CTime
-epochTime = do
- t <- getPOSIXTime
- return $ fromInteger $ truncate t
-#endif
-
-
------------------------------------------------------------------------------
fetchTime :: IO (ByteString,ByteString,CTime)
fetchTime = do
diff --git a/test/snap-server-testsuite.cabal b/test/snap-server-testsuite.cabal
index ff6def2..e300814 100644
--- a/test/snap-server-testsuite.cabal
+++ b/test/snap-server-testsuite.cabal
@@ -103,7 +103,7 @@ Executable pongserver
template-haskell,
time,
transformers,
- unix-compat,
+ unix-compat == 0.2.*,
utf8-string >= 0.3.6 && <0.4,
vector >= 0.6.0.1 && < 0.7
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
