Hello community,
here is the log from the commit of package ghc-snap-server for openSUSE:Factory
checked in at 2017-06-04 01:58:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-snap-server (Old)
and /work/SRC/openSUSE:Factory/.ghc-snap-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-snap-server"
Sun Jun 4 01:58:53 2017 rev:2 rq:499729 version:1.0.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-snap-server/ghc-snap-server.changes
2017-05-09 18:09:16.300988362 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-snap-server.new/ghc-snap-server.changes
2017-06-04 01:58:53.964080388 +0200
@@ -1,0 +2,10 @@
+Thu May 18 09:52:08 UTC 2017 - psim...@suse.com
+
+- Update to version 1.0.2.2 with cabal2obs.
+
+-------------------------------------------------------------------
+Tue May 16 08:52:12 UTC 2017 - psim...@suse.com
+
+- Update to version 1.0.2.0 revision 1 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
snap-server-1.0.2.0.tar.gz
New:
----
snap-server-1.0.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-snap-server.spec ++++++
--- /var/tmp/diff_new_pack.honzAc/_old 2017-06-04 01:58:54.651983205 +0200
+++ /var/tmp/diff_new_pack.honzAc/_new 2017-06-04 01:58:54.651983205 +0200
@@ -19,7 +19,7 @@
%global pkg_name snap-server
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.0.2.0
+Version: 1.0.2.2
Release: 0
Summary: A web server for the Snap Framework
License: BSD-3-Clause
++++++ snap-server-1.0.2.0.tar.gz -> snap-server-1.0.2.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snap-server-1.0.2.0/LICENSE
new/snap-server-1.0.2.2/LICENSE
--- old/snap-server-1.0.2.0/LICENSE 2017-04-06 17:59:04.000000000 +0200
+++ new/snap-server-1.0.2.2/LICENSE 2017-05-15 23:28:21.000000000 +0200
@@ -1,5 +1,5 @@
-Copyright (c) 2009, Snap Framework authors (see CONTRIBUTORS)
-Copyright (c) 2010, Google, Inc.
+Copyright (c) 2009-present, Snap Framework authors (see CONTRIBUTORS)
+Copyright (c) 2010-2016, Google, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snap-server-1.0.2.0/snap-server.cabal
new/snap-server-1.0.2.2/snap-server.cabal
--- old/snap-server-1.0.2.0/snap-server.cabal 2017-04-06 17:59:04.000000000
+0200
+++ new/snap-server-1.0.2.2/snap-server.cabal 2017-05-15 23:28:21.000000000
+0200
@@ -1,5 +1,5 @@
name: snap-server
-version: 1.0.2.0
+version: 1.0.2.2
synopsis: A web server for the Snap Framework
description:
Snap is a simple and fast web development framework and server written in
@@ -94,7 +94,7 @@
clock >= 0.7.1 && < 0.8,
containers >= 0.3 && < 0.6,
filepath >= 1.1 && < 2.0,
- io-streams >= 1.3 && < 1.4,
+ io-streams >= 1.3 && < 1.5,
io-streams-haproxy >= 1.0 && < 1.1,
lifted-base >= 0.1 && < 0.3,
mtl >= 2.0 && < 2.3,
@@ -203,7 +203,7 @@
containers >= 0.3 && < 0.6,
directory >= 1.0 && < 1.4,
filepath >= 1.1 && < 2.0,
- io-streams >= 1.3 && < 1.4,
+ io-streams,
io-streams-haproxy >= 1.0 && < 1.1,
lifted-base >= 0.1 && < 0.3,
monad-control >= 1.0 && < 1.1,
@@ -305,7 +305,7 @@
bytestring >= 0.9 && < 0.11,
bytestring-builder >= 0.10.4 && < 0.11,
criterion >= 0.6 && < 1.2,
- io-streams >= 1.3 && < 1.4,
+ io-streams,
io-streams-haproxy >= 1.0 && < 1.1,
snap-core >= 1.0 && < 1.1,
vector >= 0.7 && < 0.13
@@ -388,7 +388,7 @@
case-insensitive >= 1.1 && < 1.3,
clock >= 0.7.1 && < 0.8,
containers >= 0.3 && < 0.6,
- io-streams >= 1.3 && < 1.4,
+ io-streams,
io-streams-haproxy >= 1.0 && < 1.1,
lifted-base >= 0.1 && < 0.3,
mtl >= 2.0 && < 2.3,
@@ -480,7 +480,7 @@
clock >= 0.7.1 && < 0.8,
containers >= 0.3 && < 0.6,
directory >= 1.1 && < 1.4,
- io-streams >= 1.3 && < 1.4,
+ io-streams,
io-streams-haproxy >= 1.0 && < 1.1,
lifted-base >= 0.1 && < 0.3,
mtl >= 2.0 && < 2.3,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/snap-server-1.0.2.0/src/Snap/Internal/Http/Server/Session.hs
new/snap-server-1.0.2.2/src/Snap/Internal/Http/Server/Session.hs
--- old/snap-server-1.0.2.0/src/Snap/Internal/Http/Server/Session.hs
2017-04-06 17:59:04.000000000 +0200
+++ new/snap-server-1.0.2.2/src/Snap/Internal/Http/Server/Session.hs
2017-05-15 23:28:21.000000000 +0200
@@ -192,8 +192,10 @@
connClose <- newIORef False
newConn <- newIORef True
let twiddleTimeout = unsafePerformIO $ do
- th <- readMVar thMVar
- return $ TM.modify th
+ th <- readMVar thMVar
+ return $! TM.modify th
+ let cleanupTimeout = do th <- readMVar thMVar
+ return $! TM.cancel th
let !psd = PerSessionData connClose
twiddleTimeout
@@ -205,7 +207,9 @@
remotePort
readEnd
writeEnd
- restore (session psd) `E.finally` cleanup
+ restore (session psd)
+ `E.finally` cleanup
+ `E.finally` cleanupTimeout
--------------------------------------------------------------------------
session psd = do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/snap-server-1.0.2.0/src/Snap/Internal/Http/Server/TimeoutManager.hs
new/snap-server-1.0.2.2/src/Snap/Internal/Http/Server/TimeoutManager.hs
--- old/snap-server-1.0.2.0/src/Snap/Internal/Http/Server/TimeoutManager.hs
2017-04-06 17:59:04.000000000 +0200
+++ new/snap-server-1.0.2.2/src/Snap/Internal/Http/Server/TimeoutManager.hs
2017-05-15 23:28:21.000000000 +0200
@@ -19,10 +19,10 @@
------------------------------------------------------------------------------
import Control.Exception (evaluate, finally)
import qualified Control.Exception as E
-import Control.Monad (Monad ((>>=), return),
mapM_, void, when)
+import Control.Monad (Monad (return, (>>=)),
mapM_, void, when)
import qualified Data.ByteString.Char8 as S
import Data.IORef (IORef, newIORef, readIORef,
writeIORef)
-import Prelude (Bool, Double, IO, Int, Show
(..), const, fromIntegral, max, null, otherwise, round, ($), ($!), (+), (++),
(-), (.), (<=), (==))
+import Prelude (Bool, Double, IO, Int, Show
(..), const, fromIntegral, max, null, otherwise, round, ($), ($!), (+), (++),
(-), (.), (<=), (==))
------------------------------------------------------------------------------
import Control.Concurrent (MVar, newEmptyMVar,
putMVar, readMVar, takeMVar, tryPutMVar)
------------------------------------------------------------------------------
@@ -172,8 +172,8 @@
-- | Cancel a timeout.
cancel :: TimeoutThread -> IO ()
cancel h = E.uninterruptibleMask_ $ do
- T.cancel $ _thread h
writeIORef (_state h) canceled
+ T.cancel $ _thread h
{-# INLINE cancel #-}
