diff --git a/async/cohttp_async.ml b/async/cohttp_async.ml index 324fe7efe5..8f2e0868a6 100644 --- a/async/cohttp_async.ml +++ b/async/cohttp_async.ml @@ -344,9 +344,9 @@ module Server = struct |Ok res -> return res |Error exn -> respond_with_string ~code:`Not_found error_body - let create ?max_connections ?max_pending_connections - ?buffer_age_limit ?on_handler_error ?(mode=`TCP) where_to_listen handle_request = - Conduit_async.serve ?max_connections ?max_pending_connections + let create ?max_connections ?buffer_age_limit ?on_handler_error + ?(mode=`TCP) where_to_listen handle_request = + Conduit_async.serve ?max_connections ?buffer_age_limit ?on_handler_error mode where_to_listen (handle_client handle_request) >>| fun server -> diff --git a/async/cohttp_async.mli b/async/cohttp_async.mli index 53fe0462b1..aef9c7b44a 100644 --- a/async/cohttp_async.mli +++ b/async/cohttp_async.mli @@ -186,7 +186,6 @@ module Server : sig (** Build a HTTP server, based on the [Tcp.Server] interface *) val create : ?max_connections:int -> - ?max_pending_connections:int -> ?buffer_age_limit: Writer.buffer_age_limit -> ?on_handler_error:[ `Call of 'address -> exn -> unit | `Ignore diff --git a/bin/cohttp_curl_async.ml b/bin/cohttp_curl_async.ml index 8a146e86b5..4efc3cc6a4 100644 --- a/bin/cohttp_curl_async.ml +++ b/bin/cohttp_curl_async.ml @@ -34,7 +34,7 @@ let make_net_req uri meth' body () = let _ = let open Command.Spec in - Command.async_basic ~summary:"Fetch URL and print it" + Command.async ~summary:"Fetch URL and print it" (empty +> anon ("url" %: string) +> flag "-X" (optional_with_default "GET" string) diff --git a/bin/cohttp_server_async.ml b/bin/cohttp_server_async.ml index 50771da43a..fa5f800f6d 100644 --- a/bin/cohttp_server_async.ml +++ b/bin/cohttp_server_async.ml @@ -124,14 +124,14 @@ let start_server docroot port host index verbose cert_file key_file () = Server.create ~on_handler_error:(`Call (fun addr exn -> Log.Global.error "Error from %s" (Socket.Address.to_string addr); - Log.Global.sexp ~level:`Error exn Exn.sexp_of_t)) + Log.Global.sexp ~level:`Error (Exn.sexp_of_t exn))) ~mode listen_on (handler ~info ~docroot ~index ~verbose) >>= fun _ -> never () let _ = - Command.async_basic + Command.async ~summary:"Serve the local directory contents via HTTP or HTTPS" Command.Spec.( empty diff --git a/examples/async/hello_world.ml b/examples/async/hello_world.ml index 4c817a51c7..957a4a0809 100644 --- a/examples/async/hello_world.ml +++ b/examples/async/hello_world.ml @@ -27,7 +27,7 @@ let start_server port () = >>= fun _ -> Deferred.never () let () = - Command.async_basic + Command.async ~summary:"Start a hello world Async server" Command.Spec.(empty +> flag "-p" (optional_with_default 8080 int) diff --git a/examples/async/receive_post.ml b/examples/async/receive_post.ml index 8189267506..d9923c2a70 100644 --- a/examples/async/receive_post.ml +++ b/examples/async/receive_post.ml @@ -20,7 +20,7 @@ let start_server port () = >>= fun _ -> Deferred.never () let () = - Command.async_basic + Command.async ~summary:"Simple http server that outputs body of POST's" Command.Spec.(empty +> flag "-p" (optional_with_default 8080 int) diff --git a/examples/async/s3_cp.ml b/examples/async/s3_cp.ml index 56d9731bef..39df6b3b69 100644 --- a/examples/async/s3_cp.ml +++ b/examples/async/s3_cp.ml @@ -373,7 +373,7 @@ let run region_str aws_access_key aws_secret_key src dst () = end let () = - Command.async_basic + Command.async ~summary:"Simple command line client that copies files to/from S3" Command.Spec.(empty +> flag "-r" (optional_with_default "us-east-1" string) diff --git a/lib_test/test_net_async.ml b/lib_test/test_net_async.ml index cb36a7094d..a6326022ff 100644 --- a/lib_test/test_net_async.ml +++ b/lib_test/test_net_async.ml @@ -75,6 +75,6 @@ let run () = let test_cases = let open Command.Spec in - Command.async_basic ~summary:"Run HTTP Async client tests" + Command.async ~summary:"Run HTTP Async client tests" empty run |> Command.run diff --git a/lib_test/test_net_async_http10.ml b/lib_test/test_net_async_http10.ml index 3bda9f5321..a98879e725 100644 --- a/lib_test/test_net_async_http10.ml +++ b/lib_test/test_net_async_http10.ml @@ -12,6 +12,6 @@ let test () = >>| print_endline let _ = - Command.async_basic ~summary:"Test HTTP/1.0 response" + Command.async ~summary:"Test HTTP/1.0 response" Command.Spec.empty test |> Command.run diff --git a/opam b/opam index 7b76cb254e..c06696a99d 100644 --- a/opam +++ b/opam @@ -40,7 +40,7 @@ depends: [ ] depopts: ["async" "lwt" "js_of_ocaml"] conflicts: [ - "async" {< "111.25.00"} + "async" {< "113.24.00"} "lwt" {< "2.5.0"} ] available: [ocaml-version >= "4.01.0"]