[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.12.4-1-4-g3b9c224

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f46ccc19469beed76d1c4b353376a644f9dee0c1
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat May 15 14:29:00 2010 +0200

    Imported Upstream version 1.12.5

diff --git a/.hg_archival.txt b/.hg_archival.txt
index 20890ce..aa86e08 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,2 +1,2 @@
 repo: 02a7076512f3f9a3175427da3d38d621c65dedd7
-node: ae3b4761861cdf2e93a95e4914ae3e37fafdc05b
+node: d4b6c7d1461f1732ae711686e5bc33de6f2a6f69
diff --git a/.hgtags b/.hgtags
index 5e4182e..2fbf30f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -14,3 +14,4 @@ bb311ac00a7fd5e23f97c78f5071b402b4511fe6 release-1.11.0
 4ab0ed0dcf379dab2f1c79cd56d48c321ebb5947 release-1.12.1
 8d44e5636f8cfd39abf0c9d0e8578ba13c7ed0ea release-1.12.2
 c177a5d97def9d2c05a83c0db50ae75974ade996 release-1.12.3
+ae3b4761861cdf2e93a95e4914ae3e37fafdc05b release-1.12.4
diff --git a/Changelog b/Changelog
index 226d12a..3fcef3e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2010-03-17:  Fixed small copy_out bug.
+
 2010-02-17:  Signal an error at link time if multi-threading support is
              not available.
 
diff --git a/lib/META b/lib/META
index d0451c4..76b73c6 100644
--- a/lib/META
+++ b/lib/META
@@ -1,5 +1,5 @@
 name="postgresql"
-version="1.12.4"
+version="1.12.5"
 description="PostgreSQL bindings for OCaml"
 requires="unix"
 archive(byte)="postgresql.cma"
diff --git a/lib/postgresql.ml b/lib/postgresql.ml
index 2fdcc57..d6cdda2 100644
--- a/lib/postgresql.ml
+++ b/lib/postgresql.ml
@@ -804,12 +804,14 @@ object (self)
         match r with
          | 0 -> f (Buffer.contents buf); Buffer.clear buf; line ()
          | 1 -> loop (Stub.getline conn s 0 len)
-         | _ -> f (Buffer.contents buf); self#endcopy
+         | _ -> f (Buffer.contents buf)
       and line () =
         let r = Stub.getline conn s 0 len in
-        if s.[0] = '\\' && s.[1] = '.' && s.[2] = '\000' then self#endcopy
-        else loop r in
-      line ())
+        if r < 3 || s.[0] <> '\\' || s.[1] <> '.' || s.[2] <> '\000' then
+          loop r
+      in
+      line ());
+    self#endcopy
 
   method copy_out_channel oc =
     self#copy_out (fun s -> output_string oc (s ^ "\n"))

-- 
postgresql-ocaml packaging