New upstream version 6.2.2

diff --git a/CHANGES.md b/CHANGES.md
index 3c386bc6fd1923594c964ff3d192ed3ec6c6025b..33715027db42a53cfb582d3ca545d6a9d545c7a6 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+## v6.2.2 (2026-07-26)
+
+- cohttp: remove duplicate occurance of lwt in dune-project (@Alizter, #1138)
+- cohttp-lwt: factor cohttp-lwt-unix binaries into their own project (@dijkstracula, #1139)
+- cohttp-eio: update for new Eio 1.4 getaddrinfo exception (@talex5, #1142)
+
 ## v6.2.1 (2025-12-16)
 
 - cohttp: Fix syntax in forward proxy tests to recover compatibility with OCaml

diff --git a/cohttp-async.opam b/cohttp-async.opam
index f419fb640805c8ab446dba42b3d83913d41f105a..005209332b62f762c6a56db2aea4d8d3b9d1a91e 100644 (file)
--- a/cohttp-async.opam
+++ b/cohttp-async.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the Async concurrency library"

diff --git a/cohttp-bench.opam b/cohttp-bench.opam
index 69bab1eeca451f9eb6cb5398d415a2682f18008a..9e5bdf8d0dbe72c6d8af65aaed995ee0302c9da8 100644 (file)
--- a/cohttp-bench.opam
+++ b/cohttp-bench.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Benchmarks binaries for Cohttp"

diff --git a/cohttp-curl-async.opam b/cohttp-curl-async.opam
index 50f608b0f4842fe249cd48ebcdfbf16d14248984..5f8dc544c38dfceb49b7bc02139251ba3e3ae712 100644 (file)
--- a/cohttp-curl-async.opam
+++ b/cohttp-curl-async.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Cohttp client using Curl & Async as the backend"

diff --git a/cohttp-curl-lwt.opam b/cohttp-curl-lwt.opam
index a28ecf74732ded91d473c1d7ed4d0754d9a5571e..735ad62e40f864c220505790eb8cf7f89d411783 100644 (file)
--- a/cohttp-curl-lwt.opam
+++ b/cohttp-curl-lwt.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Cohttp client using Curl & Lwt as the backend"

diff --git a/cohttp-curl.opam b/cohttp-curl.opam
index df4c2f50eb4f4c4f15cfa9a68ffdb7ae0aec69db..be347e1c4bfcba2505d098eff7b6e8dffe6d8d2b 100644 (file)
--- a/cohttp-curl.opam
+++ b/cohttp-curl.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Shared code between the individual cohttp-curl clients"

diff --git a/cohttp-eio.opam b/cohttp-eio.opam
index 4d8af4928f9163d8ac52d34237cadb6170e4a27f..1f51b0feef6f6ce53ee8f8f1fa60c962153b87ff 100644 (file)
--- a/cohttp-eio.opam
+++ b/cohttp-eio.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation with eio backend"

diff --git a/cohttp-eio/tests/test_forward_proxy.ml b/cohttp-eio/tests/test_forward_proxy.ml
index d425543a4b8ee6897b181ffcd46719b3ecb34322..da2eda9f8b4156e892c149243e524d742e622d48 100644 (file)
--- a/cohttp-eio/tests/test_forward_proxy.ml
+++ b/cohttp-eio/tests/test_forward_proxy.ml
@@ -109,7 +109,8 @@ let () =
          https://www.rfc-editor.org/rfc/rfc2606 *)
     let uri = Uri.of_string "http://foo.invalid" in
     match Cohttp_eio.Client.get ~sw client uri with
-    | exception Failure _ ->
+    | exception Failure _
+    | exception Eio.Io (Eio.Net.E _, _) ->
         (* This should fail, since we are not using the proxy *)
         ()
     | unexepcted_resp, _ ->

diff --git a/cohttp-lwt-jsoo.opam b/cohttp-lwt-jsoo.opam
index d4cff347473c4ba037480b27f6e1974c2033ad9f..f4b8a2d6b913d46eae333d6b401159fbb9443770 100644 (file)
--- a/cohttp-lwt-jsoo.opam
+++ b/cohttp-lwt-jsoo.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the Js_of_ocaml JavaScript compiler"

diff --git a/cohttp-lwt-unix-bin.opam b/cohttp-lwt-unix-bin.opam
new file mode 100644 (file)
index 0000000..711dfce
--- /dev/null
+++ b/cohttp-lwt-unix-bin.opam
@@ -0,0 +1,51 @@
+version: "6.2.2"
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+synopsis: "Command-line utilities shipped with cohttp-lwt-unix"
+description: """
+This package contains the `cohttp-curl-lwt`, `cohttp-proxy-lwt`, and
+`cohttp-server-lwt` command-line utilities. They were previously built
+as part of `cohttp-lwt-unix`, but were split out so that library
+consumers do not transitively depend on `cmdliner`."""
+maintainer: ["Anil Madhavapeddy <anil@recoil.org>"]
+authors: [
+  "Anil Madhavapeddy"
+  "Stefano Zacchiroli"
+  "David Sheets"
+  "Thomas Gazagnaire"
+  "David Scott"
+  "Rudi Grinberg"
+  "Andy Ray"
+  "Anurag Soni"
+]
+license: "ISC"
+homepage: "https://github.com/mirage/ocaml-cohttp"
+doc: "https://mirage.github.io/ocaml-cohttp/"
+bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+depends: [
+  "dune" {>= "3.8"}
+  "ocaml" {>= "4.08"}
+  "cohttp" {= version}
+  "cohttp-lwt" {= version}
+  "cohttp-lwt-unix" {= version}
+  "cmdliner" {>= "2.0.0"}
+  "conduit-lwt" {>= "7.1.0"}
+  "fmt"
+  "logs"
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
\ No newline at end of file

diff --git a/cohttp-lwt-unix.opam b/cohttp-lwt-unix.opam
index ab53b2ca8b042434268ef1021f15bb5e12eba78f..2e970d2039c13de093f61c4ee306ed4cb23df86f 100644 (file)
--- a/cohttp-lwt-unix.opam
+++ b/cohttp-lwt-unix.opam
@@ -1,17 +1,19 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for Unix and Windows using Lwt"
 description: """
 An implementation of an HTTP client and server using the Lwt
 concurrency library. See the `Cohttp_lwt_unix` module for information
-on how to use this.  The package also installs `cohttp-curl-lwt`
-and a `cohttp-server-lwt` binaries for quick uses of a HTTP(S)
-client and server respectively.
+on how to use this.
 
 Although the name implies that this only works under Unix, it
 should also be fine under Windows too.
-"""
+
+The accompanying `cohttp-curl-lwt`, `cohttp-proxy-lwt`, and
+`cohttp-server-lwt` command-line utilities ship in the separate
+`cohttp-lwt-unix-bin` package so that library consumers do not
+transitively depend on `cmdliner`."""
 maintainer: ["Anil Madhavapeddy <anil@recoil.org>"]
 authors: [
   "Anil Madhavapeddy"
@@ -33,7 +35,6 @@ depends: [
   "http" {= version}
   "cohttp" {= version}
   "cohttp-lwt" {= version}
-  "cmdliner" {>= "2.0.0"}
   "lwt" {>= "3.0.0"}
   "conduit-lwt" {>= "7.1.0"}
   "conduit-lwt-unix" {>= "7.1.0"}

diff --git a/cohttp-lwt-unix/bin/dune b/cohttp-lwt-unix/bin/dune
index a80d747f743d63353e00b4fd6c492eefe8106804..44ae915ee8cfa1c827a4edacfcceafbd09028efb 100644 (file)
--- a/cohttp-lwt-unix/bin/dune
+++ b/cohttp-lwt-unix/bin/dune
@@ -1,5 +1,7 @@
 (executables
  (names cohttp_curl_lwt cohttp_proxy_lwt cohttp_server_lwt)
+ (public_names cohttp-curl-lwt cohttp-proxy-lwt cohttp-server-lwt)
+ (package cohttp-lwt-unix-bin)
  (libraries
   cohttp-lwt-unix
   cohttp_server

diff --git a/cohttp-lwt.opam b/cohttp-lwt.opam
index 604ffbb7e357fda468d335ca2674935dfe9ed9cc..cffc3eada0bad556f2f1f5cf3b140ee1ab2ba1e9 100644 (file)
--- a/cohttp-lwt.opam
+++ b/cohttp-lwt.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation using the Lwt concurrency library"

diff --git a/cohttp-mirage.opam b/cohttp-mirage.opam
index e60dfeadb5f694ab9dfdbccb9eccd07c5868c174..11300904b824f115b640c1314edec583b7583fcd 100644 (file)
--- a/cohttp-mirage.opam
+++ b/cohttp-mirage.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the MirageOS unikernel"

diff --git a/cohttp-mirage/src/client.ml b/cohttp-mirage/src/client.ml
index c9475f3a6de875b94bf76549d1d2ff8e90cfdb27..5644293876b29aab7cdccaf5c3797f28abe92b4c 100644 (file)
--- a/cohttp-mirage/src/client.ml
+++ b/cohttp-mirage/src/client.ml
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.2.1
+ * cohttp v6.2.2
  *)
 
 module Make (R : Resolver_mirage.S) (S : Conduit_mirage.S) = struct

diff --git a/cohttp-mirage/src/io.ml b/cohttp-mirage/src/io.ml
index 13f74dc88bf094f7c0f30509165e6b541dfccb89..f5124f137c23434b009f230fa8499c17f0c931ec 100644 (file)
--- a/cohttp-mirage/src/io.ml
+++ b/cohttp-mirage/src/io.ml
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.2.1
+ * cohttp v6.2.2
  *)
 
 open Lwt.Infix

diff --git a/cohttp-mirage/src/io.mli b/cohttp-mirage/src/io.mli
index 07e4127252a52265082c827374589d9c19c53e7b..b39714969d7c3eb96f547c4b80562894323ccc74 100644 (file)
--- a/cohttp-mirage/src/io.mli
+++ b/cohttp-mirage/src/io.mli
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.2.1
+ * cohttp v6.2.2
  *)
 
 (** Cohttp IO implementation using Mirage channels. *)

diff --git a/cohttp-mirage/src/static.ml b/cohttp-mirage/src/static.ml
index 4de1b2c97f4c5f3cb3d766bbfe953f4a72319e9c..77a4f5c81f4b0a936314a264b51d0cf56e7f8a32 100644 (file)
--- a/cohttp-mirage/src/static.ml
+++ b/cohttp-mirage/src/static.ml
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.2.1
+ * cohttp v6.2.2
  *)
 
 module Key = Mirage_kv.Key

diff --git a/cohttp-mirage/src/static.mli b/cohttp-mirage/src/static.mli
index f443f3d155ed746757800c4d5f2dad8a0ac3346e..4d2d2cec438e7c655706cf88e2fe7106290e8540 100644 (file)
--- a/cohttp-mirage/src/static.mli
+++ b/cohttp-mirage/src/static.mli
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * cohttp v6.2.1
+ * cohttp v6.2.2
  *)
 
 (** Serve static HTTP sites from a Mirage key-value store. *)

diff --git a/cohttp-server-lwt-unix.opam b/cohttp-server-lwt-unix.opam
index 24dba0c15b4971ece80e9cdc801783da2443656f..2e1f87f02a1ad968af62b56983d9cfff18600c33 100644 (file)
--- a/cohttp-server-lwt-unix.opam
+++ b/cohttp-server-lwt-unix.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Lightweight Cohttp + Lwt based HTTP server"
@@ -29,7 +29,6 @@ depends: [
   "conduit-lwt-unix" {with-test}
   "cohttp-lwt-unix" {with-test & = version}
   "cohttp-lwt" {with-test & = version}
-  "lwt"
   "odoc" {with-doc}
 ]
 dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"

diff --git a/cohttp-top.opam b/cohttp-top.opam
index 30065175c50f271d6c5b86edaab7688e0e647948..e27d0acc2fd8da4078da9c2d13ea38c5cc8b37dc 100644 (file)
--- a/cohttp-top.opam
+++ b/cohttp-top.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP toplevel pretty printers for HTTP types"

diff --git a/cohttp.opam b/cohttp.opam
index bded1515c3df39509c5c70416ab5e0f3ce7c60dd..f11d47da06c829d33708c1ff6276785e7581e441 100644 (file)
--- a/cohttp.opam
+++ b/cohttp.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "An OCaml library for HTTP clients and servers"

diff --git a/dune-project b/dune-project
index c71b0c463c5e9c4f855b275579ce292dbca79d97..2d5e1d3f16cac4da62a9ecf962557548cd958812 100644 (file)
--- a/dune-project
+++ b/dune-project
@@ -1,7 +1,7 @@
 (lang dune 3.8)
 
 (name cohttp)
-(version v6.2.1)
+(version v6.2.2)
 
 (license ISC)
 
@@ -92,7 +92,7 @@
  (name cohttp-lwt-unix)
  (synopsis "CoHTTP implementation for Unix and Windows using Lwt")
  (description
-  "An implementation of an HTTP client and server using the Lwt\nconcurrency library. See the `Cohttp_lwt_unix` module for information\non how to use this.  The package also installs `cohttp-curl-lwt`\nand a `cohttp-server-lwt` binaries for quick uses of a HTTP(S)\nclient and server respectively.\n\nAlthough the name implies that this only works under Unix, it\nshould also be fine under Windows too.\n")
+  "An implementation of an HTTP client and server using the Lwt\nconcurrency library. See the `Cohttp_lwt_unix` module for information\non how to use this.\n\nAlthough the name implies that this only works under Unix, it\nshould also be fine under Windows too.\n\nThe accompanying `cohttp-curl-lwt`, `cohttp-proxy-lwt`, and\n`cohttp-server-lwt` command-line utilities ship in the separate\n`cohttp-lwt-unix-bin` package so that library consumers do not\ntransitively depend on `cmdliner`.")
  (depends
   (ocaml
    (>= 4.08))
@@ -102,8 +102,6 @@
    (= :version))
   (cohttp-lwt
    (= :version))
-  (cmdliner
-   (>= 2.0.0))
   (lwt
    (>= 3.0.0))
   (conduit-lwt
@@ -119,6 +117,27 @@
   logs
   (ounit2 :with-test)))
 
+(package
+ (name cohttp-lwt-unix-bin)
+ (synopsis "Command-line utilities shipped with cohttp-lwt-unix")
+ (description
+  "This package contains the `cohttp-curl-lwt`, `cohttp-proxy-lwt`, and\n`cohttp-server-lwt` command-line utilities. They were previously built\nas part of `cohttp-lwt-unix`, but were split out so that library\nconsumers do not transitively depend on `cmdliner`.")
+ (depends
+  (ocaml
+   (>= 4.08))
+  (cohttp
+   (= :version))
+  (cohttp-lwt
+   (= :version))
+  (cohttp-lwt-unix
+   (= :version))
+  (cmdliner
+   (>= 2.0.0))
+  (conduit-lwt
+   (>= 7.1.0))
+  fmt
+  logs))
+
 (package
  (name cohttp-server-lwt-unix)
  (synopsis "Lightweight Cohttp + Lwt based HTTP server")
@@ -139,8 +158,7 @@
   (cohttp-lwt
    (and
     :with-test
-    (= :version)))
-  lwt))
+    (= :version)))))
 
 (package
  (name cohttp-lwt-jsoo)

diff --git a/http.opam b/http.opam
index 9998981056a93934eaf208e45920626490be1322..7b13443ce33bf3df1f97017a8e4b8ee8ad2a04ac 100644 (file)
--- a/http.opam
+++ b/http.opam
@@ -1,4 +1,4 @@
-version: "6.2.1"
+version: "6.2.2"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Type definitions of HTTP essentials"