Update to HTTP-4000.3.14

* If the URI contains "user:pass@" part, use it for Basic Authorization
* Add a test harness.
* Don't leak a socket when getHostAddr throws an exception.
* Send cookies in request format, not response format.
* Moved BrowserAction to be a StateT IO, with instances for
  Applicative, MonadIO, MonadState.
* Add method to control size of connection pool.
* Consider both host and port when reusing connections.
* Handle response code 304 "not modified" properly.
* Fix digest authentication by fixing md5 output string rep.
* Make the default user agent string follow the package version.
* Document lack of HTTPS support and fail when clients try
  to use it instead of silently falling back to HTTP.
* Add helper to set the request type and body.

4 files changed, 14 insertions, 96 deletions

diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index 011f244d499..8316c41737a 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2016/01/10 11:49:11 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.12 2020/01/02 15:50:01 pho Exp $
 
-DISTNAME=	HTTP-4000.2.17
-PKGREVISION=	10
+DISTNAME=	HTTP-4000.3.14
 CATEGORIES=	www
 
 MAINTAINER=	pho@cielonegro.org
@@ -9,7 +8,8 @@ COMMENT=	Haskell library for client-side HTTP
 LICENSE=	modified-bsd
 
 .include "../../mk/haskell.mk"
+.include "../../textproc/hs-parsec/buildlink3.mk"
 .include "../../devel/hs-mtl/buildlink3.mk"
 .include "../../net/hs-network/buildlink3.mk"
-.include "../../textproc/hs-parsec/buildlink3.mk"
+.include "../../net/hs-network-uri/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/hs-HTTP/PLIST b/www/hs-HTTP/PLIST
deleted file mode 100644
index 0cbbd3c07bc..00000000000
--- a/www/hs-HTTP/PLIST
+++ /dev/null
@@ -1,83 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/07/24 21:18:24 szptvlfn Exp $
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/HSHTTP-${PKGVERSION}.o
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/Browser.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/BufferType.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/Auth.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/Base.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/Base64.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/Cookie.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/HandleStream.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/Headers.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/MD5Aux.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/Proxy.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/Stream.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/HTTP/Utils.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/Stream.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/StreamDebugger.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/StreamSocket.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Network/TCP.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/Paths_HTTP.hi
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/libHSHTTP-${PKGVERSION}.a
-lib/HTTP-${PKGVERSION}/${HASKELL_VERSION}/package-description
-share/doc/HTTP-${PKGVERSION}/LICENSE
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/HTTP.haddock
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-Browser.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-BufferType.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-HTTP-Auth.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-HTTP-Base.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-HTTP-Cookie.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-HTTP-HandleStream.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-HTTP-Headers.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-HTTP-Proxy.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-HTTP-Stream.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-HTTP.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-Stream.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-StreamDebugger.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-StreamSocket.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/Network-TCP.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-A.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-All.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-B.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-C.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-D.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-E.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-F.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-G.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-H.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-I.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-L.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-M.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-N.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-O.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-P.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-Q.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-R.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-S.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-T.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-U.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index-W.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/frames.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/haddock-util.js
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/hslogo-16.png
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/index-frames.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/index.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-Browser.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-BufferType.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-HTTP-Auth.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-HTTP-Base.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-HTTP-Cookie.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-HTTP-HandleStream.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-HTTP-Headers.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-HTTP-Proxy.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-HTTP-Stream.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-HTTP.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-Stream.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-StreamDebugger.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-StreamSocket.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/mini_Network-TCP.html
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/minus.gif
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/ocean.css
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/plus.gif
-${PLIST.doc}share/doc/HTTP-${PKGVERSION}/html/synopsis.png
diff --git a/www/hs-HTTP/buildlink3.mk b/www/hs-HTTP/buildlink3.mk
index 5683c4a0e8c..04c427aabe8 100644
--- a/www/hs-HTTP/buildlink3.mk
+++ b/www/hs-HTTP/buildlink3.mk
@@ -1,17 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.11 2016/01/10 11:49:11 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2020/01/02 15:50:01 pho Exp $
 
 BUILDLINK_TREE+=	hs-HTTP
 
 .if !defined(HS_HTTP_BUILDLINK3_MK)
 HS_HTTP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-HTTP+=	hs-HTTP>=4000.2.17
-BUILDLINK_ABI_DEPENDS.hs-HTTP+=	hs-HTTP>=4000.2.17nb10
+BUILDLINK_API_DEPENDS.hs-HTTP+=	hs-HTTP>=4000.3.14
+BUILDLINK_ABI_DEPENDS.hs-HTTP+=	hs-HTTP>=4000.3.14
 BUILDLINK_PKGSRCDIR.hs-HTTP?=	../../www/hs-HTTP
 
+.include "../../textproc/hs-parsec/buildlink3.mk"
 .include "../../devel/hs-mtl/buildlink3.mk"
 .include "../../net/hs-network/buildlink3.mk"
-.include "../../textproc/hs-parsec/buildlink3.mk"
+.include "../../net/hs-network-uri/buildlink3.mk"
 .endif	# HS_HTTP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-HTTP
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index 3e7867e0206..65db27311c2 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 02:46:54 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/01/02 15:50:01 pho Exp $
 
-SHA1 (HTTP-4000.2.17.tar.gz) = e4dd82f84fab6bd90a025a087573e7a46c72ed4a
-RMD160 (HTTP-4000.2.17.tar.gz) = ff48cd11b46da823e5bb93d88c41fdc30104b8b7
-SHA512 (HTTP-4000.2.17.tar.gz) = 0c72f2f78aaa6da64c734f70e1c7e5454d0041eb0354a63b25a534614671df21433c30451ef8a54ed3e303fa105b7d0d998a4a55658933749fc77ec08d6ff8c2
-Size (HTTP-4000.2.17.tar.gz) = 69706 bytes
+SHA1 (HTTP-4000.3.14.tar.gz) = fcbb34764253b2c7460524b1b96a957cca068158
+RMD160 (HTTP-4000.3.14.tar.gz) = 47e5b6764296c27013775d273e65a30959d1b947
+SHA512 (HTTP-4000.3.14.tar.gz) = bcc9107412f3ff5806369675ae6cfd87c4ecc36490eab6d62c697f47e62ff8b0d1d6a25f9bfb9d8ef1f037492820eb732cb9cbec7ea9e7e4b20699573077b064
+Size (HTTP-4000.3.14.tar.gz) = 72938 bytes