From: Stephane Glondu <steph@glondu.net>
Date: Sat, 14 Mar 2026 08:43:20 +0000 (+0100)
Subject: New upstream version 6.2.1
X-Git-Tag: archive/raspbian/6.2.2-1+rpi1^2~5^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d5209fcaa332c22251805e9083aca9936c0fb0d9;p=ocaml-cohttp.git

New upstream version 6.2.1
---

diff --git a/CHANGES.md b/CHANGES.md
index 787607c..3c386bc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+## v6.2.1 (2025-12-16)
+
+- cohttp: Fix syntax in forward proxy tests to recover compatibility with OCaml
+  4.08 to 4.12, fixing a regression introduced in v6.2.0. (@shonfeder, #1135)
+
 ## v6.2.0 (2025-12-02)
 
 - cohttp-eio: Add support for forward proxies to the client (@shonfeder,  #1126)
diff --git a/cohttp-async.opam b/cohttp-async.opam
index c8ce71c..f419fb6 100644
--- a/cohttp-async.opam
+++ b/cohttp-async.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the Async concurrency library"
@@ -29,7 +29,7 @@ depends: [
   "ocaml" {>= "4.14" & < "5.3.0"}
   "http" {= version}
   "cohttp" {= version}
-  "async_kernel" {>= "v0.16.0"}
+  "async_kernel" {>= "v0.17.0"}
   "async_unix" {>= "v0.16.0"}
   "async" {>= "v0.16.0"}
   "base" {>= "v0.16.0"}
diff --git a/cohttp-bench.opam b/cohttp-bench.opam
index d91a2d9..69bab1e 100644
--- a/cohttp-bench.opam
+++ b/cohttp-bench.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # 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 95e11a2..50f608b 100644
--- a/cohttp-curl-async.opam
+++ b/cohttp-curl-async.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # 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 ef9c26f..a28ecf7 100644
--- a/cohttp-curl-lwt.opam
+++ b/cohttp-curl-lwt.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # 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 295b28d..df4c2f5 100644
--- a/cohttp-curl.opam
+++ b/cohttp-curl.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # 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 ee9746d..4d8af49 100644
--- a/cohttp-eio.opam
+++ b/cohttp-eio.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation with eio backend"
diff --git a/cohttp-lwt-jsoo.opam b/cohttp-lwt-jsoo.opam
index 62d56f1..d4cff34 100644
--- a/cohttp-lwt-jsoo.opam
+++ b/cohttp-lwt-jsoo.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the Js_of_ocaml JavaScript compiler"
@@ -30,7 +30,7 @@ depends: [
   "cohttp" {= version}
   "cohttp-lwt" {= version}
   "logs"
-  "lwt" {>= "3.0.0"}
+  "lwt" {>= "5.7.0"}
   "lwt_ppx" {with-test}
   "conf-npm" {with-test}
   "js_of_ocaml" {>= "3.3.0"}
diff --git a/cohttp-lwt-unix.opam b/cohttp-lwt-unix.opam
index 129c2f0..ab53b2c 100644
--- a/cohttp-lwt-unix.opam
+++ b/cohttp-lwt-unix.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for Unix and Windows using Lwt"
diff --git a/cohttp-lwt.opam b/cohttp-lwt.opam
index b5540f1..604ffbb 100644
--- a/cohttp-lwt.opam
+++ b/cohttp-lwt.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation using the Lwt concurrency library"
@@ -30,7 +30,7 @@ depends: [
   "ocaml" {>= "4.08"}
   "http" {= version}
   "cohttp" {= version}
-  "lwt" {>= "5.4.0"}
+  "lwt" {>= "5.7.0"}
   "sexplib0"
   "ipaddr" {>= "5.6.0"}
   "ppx_sexp_conv" {>= "v0.13.0"}
diff --git a/cohttp-mirage.opam b/cohttp-mirage.opam
index 13c9487..e60dfea 100644
--- a/cohttp-mirage.opam
+++ b/cohttp-mirage.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # 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 fe3d3a5..c9475f3 100644
--- 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.0
+ * cohttp v6.2.1
  *)
 
 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 d194e2b..13f74dc 100644
--- 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.0
+ * cohttp v6.2.1
  *)
 
 open Lwt.Infix
diff --git a/cohttp-mirage/src/io.mli b/cohttp-mirage/src/io.mli
index 6e48856..07e4127 100644
--- 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.0
+ * cohttp v6.2.1
  *)
 
 (** Cohttp IO implementation using Mirage channels. *)
diff --git a/cohttp-mirage/src/static.ml b/cohttp-mirage/src/static.ml
index 80a7a90..4de1b2c 100644
--- 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.0
+ * cohttp v6.2.1
  *)
 
 module Key = Mirage_kv.Key
diff --git a/cohttp-mirage/src/static.mli b/cohttp-mirage/src/static.mli
index c554424..f443f3d 100644
--- 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.0
+ * cohttp v6.2.1
  *)
 
 (** 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 1ae550a..24dba0c 100644
--- a/cohttp-server-lwt-unix.opam
+++ b/cohttp-server-lwt-unix.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Lightweight Cohttp + Lwt based HTTP server"
diff --git a/cohttp-top.opam b/cohttp-top.opam
index e07bc13..3006517 100644
--- a/cohttp-top.opam
+++ b/cohttp-top.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # 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 9216bd7..bded151 100644
--- a/cohttp.opam
+++ b/cohttp.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # 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/cohttp/test/test_proxy.ml b/cohttp/test/test_proxy.ml
index 185d618..2d796be 100644
--- a/cohttp/test/test_proxy.ml
+++ b/cohttp/test/test_proxy.ml
@@ -24,21 +24,21 @@ let select_http_proxy () =
   let proxies = proxies ~no_proxy_patterns:None in
   let expected = Some (Proxy.Direct http_proxy) in
   let actual = Proxy.get proxies @@ Uri.of_string "http://example.com" in
-  Alcotest.(check' @@ option proxy)
+  Alcotest.check' (Alcotest.option proxy)
     ~msg:"should select configured http proxy as Direct" ~actual ~expected
 
 let select_https_proxy () =
   let proxies = proxies ~no_proxy_patterns:None in
   let expected = Some (Proxy.Tunnel https_proxy) in
   let actual = Proxy.get proxies @@ Uri.of_string "https://example.com" in
-  Alcotest.(check' @@ option proxy)
+  Alcotest.check' (Alcotest.option proxy)
     ~msg:"should select configured https proxy as Tunnel" ~actual ~expected
 
 let select_default_proxy () =
   let proxies = proxies ~no_proxy_patterns:None in
   let expected = Some (Proxy.Direct fallback_proxy) in
   let actual = Proxy.get proxies @@ Uri.of_string "ftp://example.com" in
-  Alcotest.(check' @@ option proxy)
+  Alcotest.check' (Alcotest.option proxy)
     ~msg:"should select fallback proxy for unconfigured scheme" ~actual
     ~expected
 
@@ -46,14 +46,14 @@ let no_proxy_wildcard () =
   let proxies = proxies ~no_proxy_patterns:(Some "*") in
   let expected = None in
   let actual = Proxy.get proxies @@ Uri.of_string "http://example.com" in
-  Alcotest.(check' @@ option proxy)
+  Alcotest.check' (Alcotest.option proxy)
     ~msg:"should ensure no proxy is selected" ~actual ~expected
 
 let no_proxy_literal_pattern () =
   let proxies = proxies ~no_proxy_patterns:(Some "example.com") in
   let expected = None in
   let actual = Proxy.get proxies @@ Uri.of_string "http://example.com" in
-  Alcotest.(check' @@ option proxy)
+  Alcotest.check' (Alcotest.option proxy)
     ~msg:"should ensure example.com is not proxied" ~actual ~expected
 
 let no_proxy_list_of_patterns () =
@@ -61,11 +61,11 @@ let no_proxy_list_of_patterns () =
 
   let msg = "should ensure example.com is not proxied" in
   let actual = Proxy.get proxies @@ Uri.of_string "http://example.com" in
-  Alcotest.(check' @@ option proxy) ~msg ~actual ~expected:None;
+  Alcotest.check' (Alcotest.option proxy) ~msg ~actual ~expected:None;
 
   let msg = "should ensure foo.com is not proxied" in
   let actual = Proxy.get proxies @@ Uri.of_string "http://foo.com" in
-  Alcotest.(check' @@ option proxy) ~msg ~actual ~expected:None
+  Alcotest.check' (Alcotest.option proxy) ~msg ~actual ~expected:None
 
 let no_proxy_subdomain_patterns () =
   (* As per https://everything.curl.dev/usingcurl/proxies/env.html#no-proxy
@@ -77,20 +77,20 @@ let no_proxy_subdomain_patterns () =
 
   let msg = "should ensure www.example.com is not proxied" in
   let actual = Proxy.get proxies @@ Uri.of_string "http://www.example.com" in
-  Alcotest.(check' @@ option proxy) ~msg ~actual ~expected:None;
+  Alcotest.check' (Alcotest.option proxy) ~msg ~actual ~expected:None;
 
   let msg = "should ensure home.example.com is not proxied" in
   let actual = Proxy.get proxies @@ Uri.of_string "http://home.example.com" in
-  Alcotest.(check' @@ option proxy) ~msg ~actual ~expected:None;
+  Alcotest.check' (Alcotest.option proxy) ~msg ~actual ~expected:None;
 
   let msg = "should ensure example.com is proxied" in
   let actual = Proxy.get proxies @@ Uri.of_string "http://example.com" in
-  Alcotest.(check' @@ option proxy) ~msg ~actual ~expected:None;
+  Alcotest.check' (Alcotest.option proxy) ~msg ~actual ~expected:None;
 
   let msg = "nonexample.com should be proxied" in
   let actual = Proxy.get proxies @@ Uri.of_string "http://nonexample.com" in
-  Alcotest.(check' @@ option proxy)
-    ~msg ~actual ~expected:(Some (Direct http_proxy))
+  Alcotest.check' (Alcotest.option proxy) ~msg ~actual
+    ~expected:(Some (Direct http_proxy))
 
 let () =
   Alcotest.run "test_proxy"
diff --git a/dune-project b/dune-project
index 9430768..c71b0c4 100644
--- a/dune-project
+++ b/dune-project
@@ -1,7 +1,7 @@
 (lang dune 3.8)
 
 (name cohttp)
-(version v6.2.0)
+(version v6.2.1)
 
 (license ISC)
 
@@ -78,7 +78,7 @@
   (cohttp
    (= :version))
   (lwt
-   (>= 5.4.0))
+   (>= 5.7.0))
   sexplib0
   (ipaddr
    (>= 5.6.0))
@@ -158,7 +158,7 @@
    (= :version))
   logs
   (lwt
-   (>= 3.0.0))
+   (>= 5.7.0))
   (lwt_ppx :with-test)
   (conf-npm :with-test)
   (js_of_ocaml
@@ -181,7 +181,7 @@
   (cohttp
    (= :version))
   (async_kernel
-   (>= v0.16.0))
+   (>= v0.17.0))
   (async_unix
    (>= v0.16.0))
   (async
diff --git a/http.opam b/http.opam
index 1dedc50..9998981 100644
--- a/http.opam
+++ b/http.opam
@@ -1,4 +1,4 @@
-version: "6.2.0"
+version: "6.2.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Type definitions of HTTP essentials"