Merge pull request #73 from samoht/master

Update CHANGES
mirage · Mar 11, 2015 · dd13cc8 · dd13cc8
2 parents 32b192e + be20c4a
commit dd13cc8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,6 @@
 # 1.4.11
+* Fix multi round-trips in the smart HTTP protocol. This fixes
+  depth-limited clones (#71) and fetches.
 * Create the `git.http` library for abstracting away bits of the
   smart HTTP protocol.
 * Add `User-Agent` in the headers of the smart HTTP protocol. This

diff --git a/_tags b/_tags
@@ -172,4 +172,5 @@ true: annot, bin_annot
 <lib_test/*.ml{,i,y}>: use_git-unix
 # OASIS_STOP
 true: debug, bin_annot
-true: warn_error_A, warn(A-4-41-44)
+true: warn(A-4-41-44)
+# true: warn_error_A
diff --git a/lib/http/git_http.ml b/lib/http/git_http.ml
@@ -281,8 +281,8 @@ module Flow(HTTP: CLIENT) (IC: CHAN) (OC: CHAN) = struct
     let reconnect ctx =
       let t, u = Lwt.task () in
       Lwt.ignore_result @@ with_conduit uri (fun (nic, noc) ->
-          (try HTTP.close_in  ctx.ic with _ -> ());
-          (try HTTP.close_out ctx.oc with _ -> ());
+          HTTP.close_in ctx.ic;
+          HTTP.close_out ctx.oc;
           ctx.ic <- nic;
           ctx.oc <- noc;
           ctx.reader <- None;