Merge pull request haskell#92 from clinty/newer-snap-core

snap-core 1.0.0.0 has renamed rqRemoteAddr to rqClientAddr
vacationlabs · Jan 9, 2017 · d85273e · d85273e
2 parents 228673a + 9604e49
commit d85273e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/httpbin/HttpBin/Server.hs b/httpbin/HttpBin/Server.hs
@@ -149,7 +149,7 @@ respond act = do
                                     "http://" <> host <> rqURI req)]
   writeJSON =<< act ([ ("args", toJSON params)
                      , ("headers", toJSON hdrs)
-                     , ("origin", toJSON . decodeUtf8 . rqRemoteAddr $ req)
+                     , ("origin", toJSON . decodeUtf8 . rqClientAddr $ req)
                      ] <> url)
 
 meths ms h = methods ms (path "" h)

diff --git a/wreq.cabal b/wreq.cabal
@@ -141,7 +141,7 @@ executable httpbin
       bytestring,
       case-insensitive,
       containers,
-      snap-core,
+      snap-core >= 1.0.0.0,
       snap-server >= 0.9.4.4,
       text,
       time,
@@ -191,7 +191,7 @@ test-suite tests
     lens,
     lens-aeson,
     network-info,
-    snap-core,
+    snap-core >= 1.0.0.0,
     snap-server >= 0.9.4.4,
     temporary,
     test-framework,