merge revision(s) 33772:

	* test/webrick/test_cgi.rb (TestWEBrickCGI#start_cgi_server): there are
	  no guarantee of existance of RbConfig::CONFIG['LIBPATHENV'].
	  it only exists in Unix-like environments.

	* test/webrick/test_filehandler.rb
	  (WEBrick::TestFileHandler#test_script_disclosure): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 14 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index ce047864e2..bebde41900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Aug 28 00:40:14 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/webrick/test_cgi.rb (TestWEBrickCGI#start_cgi_server): there are
+	  no guarantee of existance of RbConfig::CONFIG['LIBPATHENV'].
+	  it only exists in Unix-like environments.
+
+	* test/webrick/test_filehandler.rb
+	  (WEBrick::TestFileHandler#test_script_disclosure): ditto.
+
 Thu Aug 23 12:08:25 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
 	* test/ruby/test_file_exhaustive.rb
diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb
index 0ef1b37e4f..d930c265de 100644
--- a/test/webrick/test_cgi.rb
+++ b/test/webrick/test_cgi.rb
@@ -14,7 +14,7 @@ class TestWEBrickCGI < Test::Unit::TestCase
         def req.meta_vars
           meta = super
           meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
-          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']]
+          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']] if RbConfig::CONFIG['LIBPATHENV']
           return meta
         end
       },
diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb
index f78ba5cbfc..cc27b34763 100644
--- a/test/webrick/test_filehandler.rb
+++ b/test/webrick/test_filehandler.rb
@@ -252,7 +252,7 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
         def req.meta_vars
           meta = super
           meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
-          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']]
+          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']] if RbConfig::CONFIG['LIBPATHENV']
           return meta
         end
       },
diff --git a/version.h b/version.h
index 6f86349ec6..2f1f94b883 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 263
+#define RUBY_PATCHLEVEL 264
 
-#define RUBY_RELEASE_DATE "2012-08-23"
+#define RUBY_RELEASE_DATE "2012-08-28"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"