Skip to content

Remove references to Cohttp_mirage_io #2

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
merged 1 commit into from
Dec 18, 2013
Merged

Remove references to Cohttp_mirage_io #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ setup.data
setup.log
_build
*.native
.*.swp
1 change: 1 addition & 0 deletions _oasis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ Library mirage_http_xen
Path: lib
Findlibname: mirage-http-xen
Modules: HTTP
InternalModules: HTTP_IO
BuildDepends: cohttp.lwt-core, mirage-tcpip-xen, lwt.syntax
12 changes: 6 additions & 6 deletions lib/HTTP.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ open Net

module Net_IO = struct

module IO = Cohttp_mirage_io
module IO = HTTP_IO

let connect_uri uri =
fail (Failure "not implemented")
Expand All @@ -37,13 +37,13 @@ module Net_IO = struct
end

(* Build all the core modules from the [Cohttp_lwt] functors *)
module Request = Cohttp_lwt.Make_request(Cohttp_mirage_io)
module Response = Cohttp_lwt.Make_response(Cohttp_mirage_io)
module Client = Cohttp_lwt.Make_client(Cohttp_mirage_io)(Request)(Response)(Net_IO)
module Server_core = Cohttp_lwt.Make_server(Cohttp_mirage_io)(Request)(Response)(Net_IO)
module Request = Cohttp_lwt.Make_request(HTTP_IO)
module Response = Cohttp_lwt.Make_response(HTTP_IO)
module Client = Cohttp_lwt.Make_client(HTTP_IO)(Request)(Response)(Net_IO)
module Server_core = Cohttp_lwt.Make_server(HTTP_IO)(Request)(Response)(Net_IO)

module type S = sig
include Cohttp_lwt.Server with module IO = Cohttp_mirage_io
include Cohttp_lwt.Server with module IO = HTTP_IO
val listen : ?timeout:float -> Net.Manager.t -> Net.Nettypes.ipv4_src -> t -> unit Lwt.t
end

Expand Down
3 changes: 2 additions & 1 deletion lib/mirage_http_xen.mllib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: 293c9ea246ff9985dc6f62a650f78986)
# DO NOT EDIT (digest: 120e4679a5100613b6b5c6a9d33858c7)
HTTP
HTTP_IO
# OASIS_STOP
6 changes: 3 additions & 3 deletions setup.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 3f637938a795abc214e8fbab1a479440) *)
(* DO NOT EDIT (digest: afdda2d40360841831b8c6a7912abcbe) *)
(*
Regenerated by OASIS v0.4.0
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6629,7 +6629,7 @@ let setup_t =
{
lib_modules = ["HTTP"];
lib_pack = false;
lib_internal_modules = [];
lib_internal_modules = ["HTTP_IO"];
lib_findlib_parent = None;
lib_findlib_name = Some "mirage-http-xen";
lib_findlib_containers = []
Expand All @@ -6641,7 +6641,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.0";
oasis_digest = Some "��\"&Qu\131G\"\004Go\004��\028";
oasis_digest = Some "E3HJF٢_\\\024��b]�m";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
Expand Down