Skip to content

Update to latest cohttp versions #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samoht merged 4 commits into from
Jan 3, 2018
Merged

Update to latest cohttp versions #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee26dfd
Update to latest cohttp versions
samoht Jan 3, 2018
a3904b2
Pin dev versions of cohttp-mirage
samoht Jan 3, 2018
5f5c042
Update CHANGES
samoht Jan 3, 2018
fc6b7e9
Update git-http constraints
samoht Jan 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/ma
script: bash -ex .travis-opam.sh
env:
global:
- PINS="git.dev:. git-http.dev:. git-unix.dev:. git-mirage.dev:."
- PINS="git.dev:. git-http.dev:. git-unix.dev:. git-mirage.dev:. cohttp-mirage.dev"
matrix:
- OCAML_VERSION=4.04 PACKAGE="git-unix.dev"
- OCAML_VERSION=4.03 PACKAGE="git-unix.dev"
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 1.11.4 (2018-01-03)

- support cohttp 1.0 (#249, @samoht)

### 1.11.3 (2017-11-20)

- add ocplib-endian to dependencies of git (#233, @hannesm)
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ environment:
FORK_USER: ocaml
FORK_BRANCH: master
CYG_ROOT: C:\cygwin64
PINS: "git.dev:. git-http.dev:. git-unix.dev:. git-mirage.dev:."
PINS: "git.dev:. git-http.dev:. git-unix.dev:. git-mirage.dev:. cohttp-mirage.dev"
matrix:
- PACKAGE: "git-mirage.dev"
- PACKAGE: "git-unix.dev"
Expand Down
2 changes: 1 addition & 1 deletion git-http.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ build: ["jbuilder" "build" "-p" name "-j" jobs]
depends: [
"jbuilder" {build}
"git" {>= "1.11.0"}
"cohttp-lwt" {>= "0.99.0"}
"cohttp-lwt" {>= "1.0.0"}
]
available: [ocaml-version >= "4.02.3"]
2 changes: 1 addition & 1 deletion git-mirage.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build-test: ["jbuilder" "runtest" "test/git-mirage"]

depends: [
"jbuilder" {build}
"mirage-http"
"cohttp-mirage" {>= "1.0.1"}
"mirage-flow-lwt"
"mirage-channel-lwt"
"mirage-fs-lwt"
Expand Down
2 changes: 1 addition & 1 deletion src/git-http/git_http.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module Log = struct
end

module type CLIENT = sig
module IO : Cohttp_lwt_s.IO with type 'a t = 'a Lwt.t
module IO : Cohttp_lwt.S.IO with type 'a t = 'a Lwt.t

val close_out: IO.oc -> unit (* FIXME in cohttp *)
val close_in: IO.ic -> unit (* FIXME in cohttp *)
Expand Down
2 changes: 1 addition & 1 deletion src/git-http/git_http.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
*)

module type CLIENT = sig
module IO : Cohttp_lwt_s.IO
module IO : Cohttp_lwt.S.IO

val close_out: IO.oc -> unit (* FIXME in cohttp *)
val close_in: IO.ic -> unit (* FIXME in cohttp *)
Expand Down
2 changes: 1 addition & 1 deletion src/git-mirage/git_mirage.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ end
module Smart_HTTP = struct

module Conduit_channel = Mirage_channel_lwt.Make(Conduit_mirage.Flow)
module HTTP_IO = Cohttp_mirage_io.Make(Conduit_channel)
module HTTP_IO = Cohttp_mirage.IO(Conduit_channel)
module Net = struct
type ctx = { resolver: Resolver_lwt.t; conduit: Conduit_mirage.t; }
let default_ctx = {
Expand Down
2 changes: 1 addition & 1 deletion src/git-mirage/jbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
((name git_mirage)
(public_name git-mirage)
(libraries (git mirage-flow-lwt mirage-fs-lwt mirage-channel-lwt
mirage-conduit mirage-http git-http))))
mirage-conduit cohttp-mirage git-http))))
2 changes: 1 addition & 1 deletion src/git-unix/git_unix.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ module IO_Sync = struct

module Client = struct
(* FIXME in cohttp *)
module IO = Cohttp_lwt_unix_io
module IO = Cohttp_lwt_unix.IO
let close_in x = Lwt.ignore_result (Lwt_io.close x)
let close_out x = Lwt.ignore_result (Lwt_io.close x)
end
Expand Down