Merge pull request #2 from avsm/master

Remove references to Cohttp_mirage_io

Author: avsm

.gitignore

@@ -13,3 +13,4 @@ setup.data
 setup.log
 _build
 *.native
+.*.swp

_oasis

@@ -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

lib/HTTP.ml

@@ -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")
@@ -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
 

lib/mirage_http_xen.mllib

@@ -1,4 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 293c9ea246ff9985dc6f62a650f78986)
+# DO NOT EDIT (digest: 120e4679a5100613b6b5c6a9d33858c7)
 HTTP
+HTTP_IO
 # OASIS_STOP

setup.ml

@@ -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
@@ -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 = []
@@ -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