Hello community,
here is the log from the commit of package ghc-http-reverse-proxy for
openSUSE:Factory checked in at 2016-11-10 13:22:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-http-reverse-proxy (Old)
and /work/SRC/openSUSE:Factory/.ghc-http-reverse-proxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-http-reverse-proxy"
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-http-reverse-proxy/ghc-http-reverse-proxy.changes
2016-11-01 09:55:44.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-http-reverse-proxy.new/ghc-http-reverse-proxy.changes
2016-11-10 13:22:04.000000000 +0100
@@ -1,0 +2,10 @@
+Sun Oct 30 16:29:53 UTC 2016 - [email protected]
+
+- Update to version 0.4.3.2 with cabal2obs.
+
+-------------------------------------------------------------------
+Wed Aug 17 18:30:10 UTC 2016 - [email protected]
+
+- Update to version 0.4.3.1 revision 0 with cabal2obs.
+
+-------------------------------------------------------------------
Old:
----
http-reverse-proxy-0.4.3.tar.gz
New:
----
http-reverse-proxy-0.4.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-http-reverse-proxy.spec ++++++
--- /var/tmp/diff_new_pack.mWDJhn/_old 2016-11-10 13:22:05.000000000 +0100
+++ /var/tmp/diff_new_pack.mWDJhn/_new 2016-11-10 13:22:05.000000000 +0100
@@ -19,15 +19,14 @@
%global pkg_name http-reverse-proxy
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.4.3
+Version: 0.4.3.2
Release: 0
Summary: Reverse proxy HTTP requests, either over raw sockets or with
WAI
License: BSD-3-Clause
-Group: System/Libraries
+Group: Development/Languages/Other
Url: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
BuildRequires: ghc-async-devel
BuildRequires: ghc-blaze-builder-devel
BuildRequires: ghc-bytestring-devel
@@ -55,7 +54,6 @@
BuildRequires: ghc-http-conduit-devel
BuildRequires: ghc-warp-devel
%endif
-# End cabal-rpm deps
%description
Provides a simple means of reverse-proxying HTTP requests. The raw approach
@@ -77,20 +75,14 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
%post devel
%ghc_pkg_recache
++++++ http-reverse-proxy-0.4.3.tar.gz -> http-reverse-proxy-0.4.3.2.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/http-reverse-proxy-0.4.3/ChangeLog.md
new/http-reverse-proxy-0.4.3.2/ChangeLog.md
--- old/http-reverse-proxy-0.4.3/ChangeLog.md 2015-11-19 09:48:32.000000000
+0100
+++ new/http-reverse-proxy-0.4.3.2/ChangeLog.md 2016-10-27 18:16:44.000000000
+0200
@@ -1,3 +1,11 @@
+## 0.4.3.2
+
+* Minor doc cleanup
+
+## 0.4.3.1
+
+* Use CPP so we can work with `http-client` pre and post 0.5
[#17](https://github.com/fpco/http-reverse-proxy/pull/17)
+
## 0.4.3
* Allow proxying to HTTPS servers.
[#15](https://github.com/fpco/http-reverse-proxy/pull/15)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/http-reverse-proxy-0.4.3/Network/HTTP/ReverseProxy.hs
new/http-reverse-proxy-0.4.3.2/Network/HTTP/ReverseProxy.hs
--- old/http-reverse-proxy-0.4.3/Network/HTTP/ReverseProxy.hs 2015-11-19
09:48:32.000000000 +0100
+++ new/http-reverse-proxy-0.4.3.2/Network/HTTP/ReverseProxy.hs 2016-10-16
09:35:53.000000000 +0200
@@ -4,6 +4,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE TupleSections #-}
+{-# LANGUAGE CPP #-}
module Network.HTTP.ReverseProxy
( -- * Types
ProxyDest (..)
@@ -181,8 +182,7 @@
-- the proxied server. Not all servers necessarily support chunked request
-- bodies, so please confirm that yours does (Warp, Snap, and Happstack, for
example, do).
waiProxyTo :: (WAI.Request -> IO WaiProxyResponse)
- -- ^ How to reverse proxy. A @Left@ result will be sent verbatim as
- -- the response, whereas @Right@ will cause a reverse proxy.
+ -- ^ How to reverse proxy.
-> (SomeException -> WAI.Application)
-- ^ How to handle exceptions when calling remote server. For a
-- simple 502 error page, use 'defaultOnExc'.
@@ -353,8 +353,18 @@
case edest of
Left app -> maybe id timeBound (lpsTimeBound lps) $ app req0
sendResponse
Right (ProxyDest host port, req, secure) -> tryWebSockets wps host
port req sendResponse $ do
- let req' = def
- { HC.method = WAI.requestMethod req
+ let req' =
+#if MIN_VERSION_http_client(0, 5, 0)
+ HC.defaultRequest
+ { HC.checkResponse = \_ _ -> return ()
+ , HC.responseTimeout = maybe HC.responseTimeoutNone
HC.responseTimeoutMicro $ lpsTimeBound lps
+#else
+ def
+ { HC.checkStatus = \_ _ _ -> Nothing
+ , HC.responseTimeout = lpsTimeBound lps
+#endif
+ , HC.method = WAI.requestMethod req
+ , HC.secure = secure
, HC.host = host
, HC.port = port
, HC.path = WAI.rawPathInfo req
@@ -362,9 +372,6 @@
, HC.requestHeaders = fixReqHeaders wps req
, HC.requestBody = body
, HC.redirectCount = 0
- , HC.secure = secure
- , HC.checkStatus = \_ _ _ -> Nothing
- , HC.responseTimeout = lpsTimeBound lps
}
body =
case WAI.requestBodyLength req of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/http-reverse-proxy-0.4.3/http-reverse-proxy.cabal
new/http-reverse-proxy-0.4.3.2/http-reverse-proxy.cabal
--- old/http-reverse-proxy-0.4.3/http-reverse-proxy.cabal 2015-11-19
09:48:32.000000000 +0100
+++ new/http-reverse-proxy-0.4.3.2/http-reverse-proxy.cabal 2016-10-27
18:16:36.000000000 +0200
@@ -1,5 +1,5 @@
name: http-reverse-proxy
-version: 0.4.3
+version: 0.4.3.2
synopsis: Reverse proxy HTTP requests, either over raw sockets or
with WAI
description: Provides a simple means of reverse-proxying HTTP
requests. The raw approach uses the same technique as leveraged by keter,
whereas the WAI approach performs full request/response parsing via WAI and
http-conduit.
homepage: https://github.com/fpco/http-reverse-proxy
