update to cohttp 0.12.0 api

djs55 · Nov 3, 2014 · 1eaacd1 · 1eaacd1
1 parent 351ac92
commit 1eaacd1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+0.7.6 (2014-11-04)
+* Upgrade to cohttp 0.12.0 API
+
 0.7.5 (2014-06-03)
 * Upgrade to cohttp 0.10
 * Fix incorrect handling of tar file prefixes

diff --git a/_oasis b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat: 0.3
 Name:        vhd-tool
-Version:     0.7.5
+Version:     0.7.6
 Synopsis:    .vhd file manipulation
 Authors:     Jonathan Ludlam and David Scott
 License:     LGPL-2.1 with OCaml linking exception
@@ -16,7 +16,7 @@ Executable "vhd-tool"
   MainIs:             main.ml
   Custom:             true
   Install:            false
-  BuildDepends:       lwt, lwt.unix, vhd-format, vhd-format.lwt, cmdliner, nbd, nbd.lwt, uri, cohttp (>= 0.10.0), cohttp.lwt, tar, sha, sha.sha1, io-page.unix, re.str
+  BuildDepends:       lwt, lwt.unix, vhd-format, vhd-format.lwt, cmdliner, nbd, nbd.lwt, uri, cohttp (>= 0.12.0), cohttp.lwt, tar, sha, sha.sha1, io-page.unix, re.str
 
 Executable "sparse_dd"
   Build$:             flag(xenserver)
@@ -25,4 +25,4 @@ Executable "sparse_dd"
   MainIs:             sparse_dd.ml
   Custom:             true
   Install:            false
-  BuildDepends:       lwt, lwt.unix, vhd-format, vhd-format.lwt, cmdliner, nbd, nbd.lwt, uri, cohttp (>= 0.10.0), cohttp.lwt, xenstore, xenstore.client, xenstore.unix, xenstore_transport, xenstore_transport.unix, threads, tapctl, xcp, sha, sha.sha1, tar, io-page.unix, re.str
+  BuildDepends:       lwt, lwt.unix, vhd-format, vhd-format.lwt, cmdliner, nbd, nbd.lwt, uri, cohttp (>= 0.12.0), cohttp.lwt, xenstore, xenstore.client, xenstore.unix, xenstore_transport, xenstore_transport.unix, threads, tapctl, xcp, sha, sha.sha1, tar, io-page.unix, re.str
diff --git a/src/cohttp_unbuffered_io.ml b/src/cohttp_unbuffered_io.ml
@@ -40,6 +40,7 @@ let make_input c =
   { header_buffer; header_buffer_idx; c }
 
 type oc = Channels.t
+type conn = Channels.t
 
 let really_read_into c buf ofs len =
   let tmp = Cstruct.create len in

diff --git a/src/impl.ml b/src/impl.ml
@@ -689,7 +689,7 @@ let write_stream common s destination source_protocol destination_protocol preze
         | Some x ->
           begin match Re_str.bounded_split_delim (Re_str.regexp_string ":") x 2 with
           | [ user; pass ] ->
-            let b = Cohttp.Auth.(to_string (Basic (user, pass))) in
+            let b = Cohttp.Auth.string_of_resp (`Basic (user, pass)) in
             Header.add headers "authorization" b
           | _ ->
             Printf.fprintf stderr "I don't know how to handle authentication for this URI.\n Try scheme://user:password@host/path\n";