summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-24 19:08:08 +0000
committerwyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-24 19:08:08 +0000
commit1da4e3b919e99e6128ab017f215a909304dd6743 (patch)
tree80f6c61154fe1b02b508acd53666099fba2ad71a
parent91b056e10d2e3c6ba5f3c684273859512c2391d9 (diff)
Backport #776 [ruby-core:20043]; Added an #ifdef _WIN32 to rb_io_flush in io.c to fsync on windows to ensure that a flush took place.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@28003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog14
-rw-r--r--io.c4
-rw-r--r--version.h2
3 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 92db48b678..72005c9a65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,18 @@
-Mon May 24 06:26:00 2010 Kirk haines <khaines@ruby-lang.org>
+Mon May 25 06:59:00 2010 Kirk Haines <khaines@ruby-lang.org>
- * ext/openssl/ossl_config.c: Backport #484 [ruby-core:18377]; OpenSSL::Config now freezes correctly, preventing further modification.
+ * ChangeLog: Changed dates on the last commit records, because I didn't shift the day when I shifted timezones to JST.
-Mon May 24 05:25:00 2010 Kirk haines <khaines@ruby-lang.org>
+ * io.c: Backport #776 [ruby-core:20043]; added an ifdef _#WIN32 to rb_io_flush to do an fsync on windows.
+
+Mon May 25 06:26:00 2010 Kirk haines <khaines@ruby-lang.org>
+
+ * ext/openssl/ossl_config.c: Backport #484 [ruby-core:18377]; OpenSSL::Config now freezes correctly, preventing further modification. r28002
+
+Mon May 25 05:25:00 2010 Kirk haines <khaines@ruby-lang.org>
* lib/fileutils.rb: Backport #1700 [ruby-core:24078]; stringify group argument in #fu_get_gid before making regexp match. r28001
-Mon May 24 05:15:00 2010 Kirk Haines <khaines@ruby-lang.org>
+Mon May 25 05:15:00 2010 Kirk Haines <khaines@ruby-lang.org>
* configure.in: Bug #2553 [ruby-core:27380]; Add a --disable-ucontext option, for use with --enable-pthreads, to avoid performance loss from --enable-pthreads and the oodles of sigprocmask calls that normally brings. r27999
diff --git a/io.c b/io.c
index dc06d1062e..bb5ea9fa82 100644
--- a/io.c
+++ b/io.c
@@ -643,7 +643,9 @@ rb_io_flush(io)
f = GetWriteFile(fptr);
io_fflush(f, fptr);
-
+#ifdef _WIN32
+ fsync(fileno(f));
+#endif
return io;
}
diff --git a/version.h b/version.h
index 951f55ee20..406b677cb6 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-05-25"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20100525
-#define RUBY_PATCHLEVEL 401
+#define RUBY_PATCHLEVEL 402
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8