commit ghc-wai-logger for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package ghc-wai-logger for openSUSE:Factory checked in at 2016-01-21 23:43:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-wai-logger (Old)
and /work/SRC/openSUSE:Factory/.ghc-wai-logger.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-wai-logger"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-wai-logger/ghc-wai-logger.changes 2015-06-15 17:49:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-wai-logger.new/ghc-wai-logger.changes 2016-01-22 01:08:18.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Jan 15 10:26:18 UTC 2016 - mimi.vx@gmail.com
+
+- update to 2.2.5
+
+-------------------------------------------------------------------
Old:
----
wai-logger-2.2.4.1.tar.gz
New:
----
wai-logger-2.2.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-wai-logger.spec ++++++
--- /var/tmp/diff_new_pack.6oSDAT/_old 2016-01-22 01:08:20.000000000 +0100
+++ /var/tmp/diff_new_pack.6oSDAT/_new 2016-01-22 01:08:20.000000000 +0100
@@ -21,7 +21,7 @@
%bcond_with tests
Name: ghc-wai-logger
-Version: 2.2.4.1
+Version: 2.2.5
Release: 0
Summary: A logging system for WAI
License: MIT
++++++ wai-logger-2.2.4.1.tar.gz -> wai-logger-2.2.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.4.1/Network/Wai/Logger/Apache.hs new/wai-logger-2.2.5/Network/Wai/Logger/Apache.hs
--- old/wai-logger-2.2.4.1/Network/Wai/Logger/Apache.hs 2015-06-09 05:29:42.000000000 +0200
+++ new/wai-logger-2.2.5/Network/Wai/Logger/Apache.hs 2016-01-13 08:28:24.000000000 +0100
@@ -8,6 +8,9 @@
#ifndef MIN_VERSION_base
#define MIN_VERSION_base(x,y,z) 1
#endif
+#ifndef MIN_VERSION_wai
+#define MIN_VERSION_wai(x,y,z) 1
+#endif
import Data.ByteString.Char8 (ByteString)
import qualified Data.ByteString.Char8 as BS
@@ -55,17 +58,21 @@
<> " "
<> toLogStr (maybe "-" show msize)
<> " \""
- <> toLogStr (lookupRequestField' "referer" req)
+ <> toLogStr (fromMaybe "" mr)
<> "\" \""
- <> toLogStr (lookupRequestField' "user-agent" req)
+ <> toLogStr (fromMaybe "" mua)
<> "\"\n"
where
#if !MIN_VERSION_base(4,5,0)
(<>) = mappend
#endif
-
-lookupRequestField' :: CI ByteString -> Request -> ByteString
-lookupRequestField' k req = fromMaybe "" . lookup k $ requestHeaders req
+#if MIN_VERSION_wai(3,2,0)
+ mr = requestHeaderReferer req
+ mua = requestHeaderUserAgent req
+#else
+ mr = lookup "referer" $ requestHeaders req
+ mua = lookup "user-agent" $ requestHeaders req
+#endif
-- getSourceIP = getSourceIP fromString fromByteString
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.4.1/test/doctests.hs new/wai-logger-2.2.5/test/doctests.hs
--- old/wai-logger-2.2.4.1/test/doctests.hs 2015-06-09 05:29:42.000000000 +0200
+++ new/wai-logger-2.2.5/test/doctests.hs 2016-01-13 08:28:24.000000000 +0100
@@ -3,9 +3,4 @@
import Test.DocTest
main :: IO ()
-main = doctest [
- "-idist/build/autogen/"
- , "-optP-include"
- , "-optPdist/build/autogen/cabal_macros.h"
- , "Network/Wai/Logger.hs"
- ]
+main = doctest ["Network"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.2.4.1/wai-logger.cabal new/wai-logger-2.2.5/wai-logger.cabal
--- old/wai-logger-2.2.4.1/wai-logger.cabal 2015-06-09 05:29:42.000000000 +0200
+++ new/wai-logger-2.2.5/wai-logger.cabal 2016-01-13 08:28:24.000000000 +0100
@@ -1,5 +1,5 @@
Name: wai-logger
-Version: 2.2.4.1
+Version: 2.2.5
Author: Kazu Yamamoto
participants (1)
-
root@hilbert.suse.de