diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-15 09:17:58 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-15 09:17:58 +0000 |
commit | 2d1ccd382629d99af75f5d5f4b6435145a82f0b0 (patch) | |
tree | 62060066a3995f3ed553cdf390a853a94dd83894 | |
parent | 54ee97d73129e743f9607430438e2e9fe5378923 (diff) | |
download | ruby-2d1ccd382629d99af75f5d5f4b6435145a82f0b0.tar.gz |
* lib/cgi/session.rb (CGI::Session::FileStore::restore): use
lockfile for exclusive locks. a patch from <tommy AT tmtm.org>.
[ruby-dev:32296]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/cgi/session.rb | 16 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 21 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Thu Nov 15 12:19:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/cgi/session.rb (CGI::Session::FileStore::restore): use + lockfile for exclusive locks. a patch from <tommy AT tmtm.org>. + [ruby-dev:32296] + Wed Nov 14 01:52:59 2007 Tanaka Akira <akr@fsij.org> * missing/isinf.c (isinf): don't define if the macro is defined. diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb index 63d8cc97b2..e7e7587c65 100644 --- a/lib/cgi/session.rb +++ b/lib/cgi/session.rb @@ -397,8 +397,9 @@ class CGI unless @hash @hash = {} begin + lockf = File.open(@path+".lock", "r") + lockf.flock File::LOCK_SH f = File.open(@path, 'r') - f.flock File::LOCK_SH for line in f line.chomp! k, v = line.split('=',2) @@ -406,6 +407,7 @@ class CGI end ensure f.close unless f.nil? + lockf.close if lockf end end @hash @@ -415,13 +417,17 @@ class CGI def update return unless @hash begin - f = File.open(@path, File::CREAT|File::TRUNC|File::RDWR, 0600) - f.flock File::LOCK_EX + lockf = File.open(@path+".lock", File::CREAT|File::RDWR, 0600) + lockf.flock File::LOCK_EX + f = File.open(@path+".new", File::CREAT|File::TRUNC|File::WRONLY, 0600) for k,v in @hash f.printf "%s=%s\n", CGI::escape(k), CGI::escape(String(v)) end + f.close + File.rename @path+".new", @path ensure - f.close unless f.nil? + f.close if f and !f.closed? + lockf.close if lockf end end @@ -432,6 +438,8 @@ class CGI # Close and delete the session's FileStore file. def delete + File::unlink @path+".lock" rescue nil + File::unlink @path+".new" rescue nil File::unlink @path rescue Errno::ENOENT end @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-11-14" +#define RUBY_RELEASE_DATE "2007-11-15" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20071114 +#define RUBY_RELEASE_CODE 20071115 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 15 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |