Author: vouillon
Date: 2009-05-28 05:23:33 -0400 (Thu, 28 May 2009)
New Revision: 343
Modified:
branches/2.32/src/RECENTNEWS
branches/2.32/src/lwt/lwt_unix.ml
branches/2.32/src/mkProjectInfo.ml
branches/2.32/src/uicommon.ml
Log:
* Fixed quotation of paths and names when writing to a preference file
* Workaround for bug in new "select" implementation in Ocaml 3.11
(select fails with EPIPE error when monitoring a remotely closed
file descriptor)
Modified: branches/2.32/src/RECENTNEWS
===================================================================
--- branches/2.32/src/RECENTNEWS 2009-05-28 09:21:56 UTC (rev 342)
+++ branches/2.32/src/RECENTNEWS 2009-05-28 09:23:33 UTC (rev 343)
@@ -1,3 +1,11 @@
+CHANGES FROM VERSION 2.32.25
+
+* Fixed quotation of paths and names when writing to a preference file
+* Workaround for bug in new "select" implementation in Ocaml 3.11
+ (select fails with EPIPE error when monitoring a remotely closed
+ file descriptor)
+
+-------------------------------
CHANGES FROM VERSION 2.32.23
* Added some missing convertUnixErrorsToTransient
Modified: branches/2.32/src/lwt/lwt_unix.ml
===================================================================
--- branches/2.32/src/lwt/lwt_unix.ml 2009-05-28 09:21:56 UTC (rev 342)
+++ branches/2.32/src/lwt/lwt_unix.ml 2009-05-28 09:23:33 UTC (rev 343)
@@ -132,6 +132,11 @@
([], [], [])
| Unix.Unix_error (Unix.EBADF, _, _) ->
(List.filter bad_fd infds, List.filter bad_fd outfds, [])
+ | Unix.Unix_error (Unix.EPIPE, _, _)
+ when windows_hack && recent_ocaml ->
+ (* Workaround for a bug in Ocaml 3.11: select fails with an
+ EPIPE error when the file descriptor is remotely closed *)
+ (infds, [], [])
in
restart_threads !event_counter now;
List.iter
Modified: branches/2.32/src/mkProjectInfo.ml
===================================================================
--- branches/2.32/src/mkProjectInfo.ml 2009-05-28 09:21:56 UTC (rev 342)
+++ branches/2.32/src/mkProjectInfo.ml 2009-05-28 09:23:33 UTC (rev 343)
@@ -111,3 +111,4 @@
+
Modified: branches/2.32/src/uicommon.ml
===================================================================
--- branches/2.32/src/uicommon.ml 2009-05-28 09:21:56 UTC (rev 342)
+++ branches/2.32/src/uicommon.ml 2009-05-28 09:23:33 UTC (rev 343)
@@ -360,7 +360,7 @@
let pos = ref 0 in
for i = 0 to len - 1 do
match s.[i] with
- '*' | '?' | '[' | '{' as c ->
+ '*' | '?' | '[' | '{' | '}' | ',' | '\\' as c ->
buf.[!pos] <- '\\'; buf.[!pos + 1] <- c; pos := !pos + 2
| c ->
buf.[!pos] <- c; pos := !pos + 1