New upstream version 6.1.1

diff --git a/CHANGES.md b/CHANGES.md
index 5f70bd80a3c6e65d380702c2aa5d1bff9fe270f0..1f104bec3405181ea36333e84a066d9802bdcad4 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,10 @@
-# v6.1.0 (2025-03-03)
+## v6.1.1 (2025-05-28)
+
+- cohttp-mirage: make client usable again -- this fixes a regression introduced
+  by #1080 (@Firobe, review by @edwintorok, #1110)
+- rename main function on README example (@Unn4m3DD, #1097)
+
+## v6.1.0 (2025-03-03)
 
 - cohttp-lwt-unix: Add http/https proxy support for client requests (@art-w @MisterDA, #1080)
 - cohttp-mirage: Support conduit 8.0.0 (@hannesm, #1104)

diff --git a/README.md b/README.md
index 2a026f204f6b40e2dfca3a35c84f5153e457e595..2436d5a63b09d582d14d6153c90ed0560d847de0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ open Lwt
 open Cohttp
 open Cohttp_lwt_unix
 
-let body =
+let main =
   Client.get (Uri.of_string "https://www.reddit.com/") >>= fun (resp, body) ->
   let code = resp |> Response.status |> Code.code_of_status in
   Printf.printf "Response code: %d\n" code;
@@ -89,7 +89,7 @@ let body =
   body
 
 let () =
-  let body = Lwt_main.run body in
+  let body = Lwt_main.run main in
   print_endline ("Received body\n" ^ body)
 ```
 

diff --git a/cohttp-async.opam b/cohttp-async.opam
index 523458090fa3fcc29528f8bdda7d64a6e25a906e..c1c438c2ade35152fe18d79f83b6b3115a1b101d 100644 (file)
--- a/cohttp-async.opam
+++ b/cohttp-async.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the Async concurrency library"
@@ -63,4 +63,5 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-available: arch != "s390x"
\ No newline at end of file
+available: arch != "s390x"
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-async.opam.template b/cohttp-async.opam.template
index 876f1f762afdfedd1d33318e137efbdca1f6ddd5..84c651e95813681cf502c08b290b910ac4405a2a 100644 (file)
--- a/cohttp-async.opam.template
+++ b/cohttp-async.opam.template
@@ -13,3 +13,4 @@ build: [
   ]
 ]
 available: arch != "s390x"
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-bench.opam b/cohttp-bench.opam
index 3f7dbcd317cf2a01596557a2e799e6129485a460..fac821a360ec0d87a821959e40cd1de54733d677 100644 (file)
--- a/cohttp-bench.opam
+++ b/cohttp-bench.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Benchmarks binaries for Cohttp"
@@ -51,4 +51,5 @@ build: [
     "@cohttp-bench/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-bench.opam.template b/cohttp-bench.opam.template
index 6edcaf30dacf58f2dfb17413e8b444677c424fb8..8c3e513f825fe9f4a519c964b984f293e2451beb 100644 (file)
--- a/cohttp-bench.opam.template
+++ b/cohttp-bench.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-curl-async.opam b/cohttp-curl-async.opam
index d855be44a65d2c7bcbb73d2b7b6c740cb89e4c06..0dffa0fc9142cf577549eb282809e24ad9138cbd 100644 (file)
--- a/cohttp-curl-async.opam
+++ b/cohttp-curl-async.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Cohttp client using Curl & Async as the backend"
@@ -52,4 +52,5 @@ build: [
     "@cohttp-curl-async/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-curl-async.opam.template b/cohttp-curl-async.opam.template
index 87a61e87ad610a6c4fc55514984bdb7b94d26093..3b4adae73b59973af77da6b8583d164bfda5297e 100644 (file)
--- a/cohttp-curl-async.opam.template
+++ b/cohttp-curl-async.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-curl-lwt.opam b/cohttp-curl-lwt.opam
index 49b43c8abfdb61d36175bf0b0c601143c4973691..c180c05846ed41377bf08e75201a82cd11fc1523 100644 (file)
--- a/cohttp-curl-lwt.opam
+++ b/cohttp-curl-lwt.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Cohttp client using Curl & Lwt as the backend"
@@ -51,4 +51,5 @@ build: [
     "@cohttp-curl-lwt/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-curl-lwt.opam.template b/cohttp-curl-lwt.opam.template
index a49a0e085a900ee1b3514664650efeeb4102fe95..ced5cee59f296ee533fbb65faadcc8dfb5a0f4be 100644 (file)
--- a/cohttp-curl-lwt.opam.template
+++ b/cohttp-curl-lwt.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-curl.opam b/cohttp-curl.opam
index dcd07e12064d41d86bd42c6be9674b055e216184..0845bdb9818c52c4a10ca5d68eb29a526a96c9c0 100644 (file)
--- a/cohttp-curl.opam
+++ b/cohttp-curl.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Shared code between the individual cohttp-curl clients"
@@ -40,4 +40,5 @@ build: [
     "@cohttp-curl/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-curl.opam.template b/cohttp-curl.opam.template
index aef9de52faa25dbb40d0d27653d7e641be2c645e..09c9873b296e22f90e546e13916a7c12492906fd 100644 (file)
--- a/cohttp-curl.opam.template
+++ b/cohttp-curl.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-eio.opam b/cohttp-eio.opam
index d3ef96d85cc4304f46cd4a85e3b4c56084bf9360..f7cbf9b45acde57163366fab746897c578af0f68 100644 (file)
--- a/cohttp-eio.opam
+++ b/cohttp-eio.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation with eio backend"
@@ -52,4 +52,5 @@ build: [
     "@cohttp-eio/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-eio.opam.template b/cohttp-eio.opam.template
index ee960d91c46eafe5764cf49c5df1b80406e152f4..2d9bf652a3a81ff307311cc520abfddebe44d1e2 100644 (file)
--- a/cohttp-eio.opam.template
+++ b/cohttp-eio.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-lwt-jsoo.opam b/cohttp-lwt-jsoo.opam
index e6d779cbe6b5f7d3609ec75a67d5db0f13748289..a7e28d99d9c97c5a583f3b5b9c3c34f0f6b576bd 100644 (file)
--- a/cohttp-lwt-jsoo.opam
+++ b/cohttp-lwt-jsoo.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.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"
@@ -52,4 +52,5 @@ build: [
     "@cohttp-lwt-jsoo/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-lwt-jsoo.opam.template b/cohttp-lwt-jsoo.opam.template
index 0ff35b3ed9fa0fc2c8be10622cb5b7c2d83f0156..d37c3d1e4c8ceb329871d9b613755e24a4dce020 100644 (file)
--- a/cohttp-lwt-jsoo.opam.template
+++ b/cohttp-lwt-jsoo.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-lwt-unix.opam b/cohttp-lwt-unix.opam
index 5255559a6fe86536aa35fc255de2210bad8af506..406e281a79ee2dccac0a51d319096543ef91240c 100644 (file)
--- a/cohttp-lwt-unix.opam
+++ b/cohttp-lwt-unix.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for Unix and Windows using Lwt"
@@ -59,4 +59,5 @@ build: [
     "@cohttp-lwt-unix/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-lwt-unix.opam.template b/cohttp-lwt-unix.opam.template
index 75ab83a7c4b7a8e3394acb84d8f2c446230f9892..8b5d336f475109f866a793b26170109d8653a8c0 100644 (file)
--- a/cohttp-lwt-unix.opam.template
+++ b/cohttp-lwt-unix.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-lwt.opam b/cohttp-lwt.opam
index 487026e6626a3616802a2f4c56cbdb3d3543eb04..8c4d9e6bf52accfc9b2c5535fec288f71460dd44 100644 (file)
--- a/cohttp-lwt.opam
+++ b/cohttp-lwt.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation using the Lwt concurrency library"
@@ -52,4 +52,5 @@ build: [
     "@cohttp-lwt/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-lwt.opam.template b/cohttp-lwt.opam.template
index bb5ecb04ccc9fbc5e79c3d2592056449d6369f7c..d737510751243c326076fac137c6978777952cd4 100644 (file)
--- a/cohttp-lwt.opam.template
+++ b/cohttp-lwt.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-mirage.opam b/cohttp-mirage.opam
index ef93290139d4f317d6d4c4e38c9f15824e6f4294..56f20ba831c175f1e4d5a0012c5d676cd32ab926 100644 (file)
--- a/cohttp-mirage.opam
+++ b/cohttp-mirage.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP implementation for the MirageOS unikernel"
@@ -59,4 +59,5 @@ build: [
     "@cohttp-mirage/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-mirage.opam.template b/cohttp-mirage.opam.template
index 12c1e063be3433b0cf99cbac1a922fbbdb033005..e887f36acc68fc0024329ec85bfaab027becd72b 100644 (file)
--- a/cohttp-mirage.opam.template
+++ b/cohttp-mirage.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-mirage/src/client.ml b/cohttp-mirage/src/client.ml
index 1f06e74e19d2344289a7e1bb037959f1c3233a71..f9fd32a8f579febb796c554e57d34aec7681f354 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.1.0
+ * cohttp v6.1.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 cfd7147d7ad2f20be9ad517cdb4638d43083974c..936e8fd3dc87f1b03b6d2772ed7aad3d0544ad8d 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.1.0
+ * cohttp v6.1.1
  *)
 
 open Lwt.Infix

diff --git a/cohttp-mirage/src/io.mli b/cohttp-mirage/src/io.mli
index b9422cabce3d7e812eb7084945a8b2af1caec6db..816aef15c32f3ac8a85e0ca424856bbe704944f6 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.1.0
+ * cohttp v6.1.1
  *)
 
 (** Cohttp IO implementation using Mirage channels. *)

diff --git a/cohttp-mirage/src/net.ml b/cohttp-mirage/src/net.ml
index 83758883832307873b6dad4330fdab240f8b5a70..249363a3030eed40ab885d5c275b799519433c08 100644 (file)
--- a/cohttp-mirage/src/net.ml
+++ b/cohttp-mirage/src/net.ml
@@ -18,8 +18,8 @@ module Make (R : Resolver_mirage.S) (S : Conduit_mirage.S) = struct
   type endp = Conduit.endp
   type client
 
-  let tunnel = failwith "Unimplemented"
-  let connect_client = failwith "Unimplemented"
+  let tunnel _ _ = failwith "Unimplemented"
+  let connect_client ~ctx:_ _ = failwith "Unimplemented"
   let resolve ~ctx uri = R.resolve_uri ~uri ctx.resolver
 
   let connect_endp ~ctx endp =

diff --git a/cohttp-mirage/src/static.ml b/cohttp-mirage/src/static.ml
index 8b4addec7b12e4371f3539370345cd78df4255b5..7e678c3d1e7631bbe29343fc00ee6db9d5d7e035 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.1.0
+ * cohttp v6.1.1
  *)
 
 module Key = Mirage_kv.Key

diff --git a/cohttp-mirage/src/static.mli b/cohttp-mirage/src/static.mli
index 6de49c76ca44e9d5495c12a2039acaef603370a7..c71ec152d584e8d8f30553eb49adb3075d493dd3 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.1.0
+ * cohttp v6.1.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 f462a7f58a63c95a49509d828f61536e0ba8a84f..8a6ff30ca9e285b3b2608d419e7041a84c35f655 100644 (file)
--- a/cohttp-server-lwt-unix.opam
+++ b/cohttp-server-lwt-unix.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Lightweight Cohttp + Lwt based HTTP server"
@@ -46,4 +46,5 @@ build: [
     "@cohttp-server-lwt-unix/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-server-lwt-unix.opam.template b/cohttp-server-lwt-unix.opam.template
index e2f8753ab9c087653aebf13d299289f31d5a677e..8b296089ac20a2156418c27eb55bfd688787e040 100644 (file)
--- a/cohttp-server-lwt-unix.opam.template
+++ b/cohttp-server-lwt-unix.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp-top.opam b/cohttp-top.opam
index fe477861d24314acc8c3140beed088d1eeb91464..8d3cea9cf4a0c9a32ece47573947be6e449d34b8 100644 (file)
--- a/cohttp-top.opam
+++ b/cohttp-top.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "CoHTTP toplevel pretty printers for HTTP types"
@@ -43,4 +43,5 @@ build: [
     "@cohttp-top/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp-top.opam.template b/cohttp-top.opam.template
index 7fc8179fe462282dadb68b7de5179c662f59299c..a9e1f00c3e865f716d7aed56bbd72c153784fdd2 100644 (file)
--- a/cohttp-top.opam.template
+++ b/cohttp-top.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/cohttp.opam b/cohttp.opam
index 355227300d041305470a2527edd6a57e05cd44b1..b3c303fe17be4bc66e39c46bcc1c48559d1b6aa2 100644 (file)
--- a/cohttp.opam
+++ b/cohttp.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "An OCaml library for HTTP clients and servers"
@@ -64,4 +64,5 @@ build: [
     "@cohttp/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/cohttp.opam.template b/cohttp.opam.template
index c393af7612f5ac44055ec10d8c5b0cf9954b0309..eb9d8fa95dea9a011d891d6c76699aa08a8c033f 100644 (file)
--- a/cohttp.opam.template
+++ b/cohttp.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]

diff --git a/dune-project b/dune-project
index f03e57b885742fff22f6917bd6f857a6630a7685..cc41ea2e5513e0593ea2f0fd611f81f0b2c47949 100644 (file)
--- a/dune-project
+++ b/dune-project
@@ -1,7 +1,7 @@
 (lang dune 3.8)
 
 (name cohttp)
-(version v6.1.0)
+(version v6.1.1)
 
 (license ISC)
 

diff --git a/http.opam b/http.opam
index 0909a062d6e74e7c756d4ab40ae8e04fb6ec4a04..1effc19f096a21993f6acc394569d2be706f1281 100644 (file)
--- a/http.opam
+++ b/http.opam
@@ -1,4 +1,4 @@
-version: "6.1.0"
+version: "6.1.1"
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Type definitions of HTTP essentials"
@@ -49,4 +49,5 @@ build: [
     "@http/runtest" {with-test}
     "@doc" {with-doc}
   ]
-]
\ No newline at end of file
+]
+x-maintenance-intent: [ "(latest)" ]
\ No newline at end of file

diff --git a/http.opam.template b/http.opam.template
index 4c18700a0c9f469afdc89546d7529f454d432b08..c20f934d4a8a34890a0715046237155dee354ba3 100644 (file)
--- a/http.opam.template
+++ b/http.opam.template
@@ -12,3 +12,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: [ "(latest)" ]