From 2dd9de0a322d14a46b337e72454d55f039c8cdfb Mon Sep 17 00:00:00 2001
From: Amir Chaudhry <amirmc@gmail.com>
Date: Mon, 19 Jan 2015 18:27:57 +0000
Subject: [PATCH] update mirage files

---
 _mirage/README.md   |  7 +++----
 _mirage/config.ml   | 11 +++++++++--
 _mirage/dispatch.ml |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/_mirage/README.md b/_mirage/README.md
index 109f93e..8984b33 100644
--- a/_mirage/README.md
+++ b/_mirage/README.md
@@ -16,14 +16,13 @@ in this folder.
 Since these files are copy/pasted from another repo, the following links
 should help to check if things have been updated upstream
 
-Files are from:
-https://github.com/mirage/mirage-skeleton/commit/6c75202f5a0272a97b1de66dd12054982da91f6f
+Files are from: https://github.com/mirage/mirage-skeleton/commit/1709bad5bac9484b8feb476aa6803e464d66057b
 
-Latest versions:
+Latest versions are:
 - [config.ml][]
 - [dispatch.ml][]
 
-[1] https://github.com/mirage/mirage-skeleton
+[1]: https://github.com/mirage/mirage-skeleton
 
 [mirage unikernel]: http://openmirage.org
 [Travis CI]: https://travis-ci.org
diff --git a/_mirage/config.ml b/_mirage/config.ml
index 9bc93b8..524d8ec 100644
--- a/_mirage/config.ml
+++ b/_mirage/config.ml
@@ -38,12 +38,19 @@ let stack console =
   | `Socket, _     -> socket_stackv4 console [Ipaddr.V4.any]
 
 let server =
-  http_server 80 (stack default_console)
+  conduit_direct (stack default_console)
+
+let http_srv =
+  let mode = `TCP (`Port 80) in
+  http_server mode server
 
 let main =
   foreign "Dispatch.Main" (console @-> kv_ro @-> http @-> job)
 
 let () =
+  add_to_ocamlfind_libraries ["re.str"];
+  add_to_opam_packages ["re"];
+
   register "www" [
-    main $ default_console $ fs $ server
+    main $ default_console $ fs $ http_srv
   ]
diff --git a/_mirage/dispatch.ml b/_mirage/dispatch.ml
index 929ef2e..70739f8 100644
--- a/_mirage/dispatch.ml
+++ b/_mirage/dispatch.ml
@@ -46,10 +46,10 @@ module Main (C:CONSOLE) (FS:KV_RO) (S:Cohttp_lwt.Server) = struct
       let uri = S.Request.uri request in
       dispatcher (split_path uri)
     in
-    let conn_closed conn_id () =
+    let conn_closed (_,conn_id) =
       let cid = Cohttp.Connection.to_string conn_id in
       C.log c (Printf.sprintf "conn %s closed" cid)
     in
-    http { S.callback; conn_closed }
+    http (S.make ~conn_closed ~callback ())
 
 end