naruse	2012-08-28 00:40:30 +0900 (Tue, 28 Aug 2012)

  New Revision: 36834

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36834

  Log:
    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.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/webrick/test_cgi.rb
    branches/ruby_1_9_3/test/webrick/test_filehandler.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36833)
+++ ruby_1_9_3/ChangeLog	(revision 36834)
@@ -1,3 +1,12 @@
+Tue Aug 28 00:40:14 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@g...>
 
 	* test/ruby/test_file_exhaustive.rb
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36833)
+++ ruby_1_9_3/version.h	(revision 36834)
@@ -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"
 
Index: ruby_1_9_3/test/webrick/test_cgi.rb
===================================================================
--- ruby_1_9_3/test/webrick/test_cgi.rb	(revision 36833)
+++ ruby_1_9_3/test/webrick/test_cgi.rb	(revision 36834)
@@ -14,7 +14,7 @@
         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
       },
Index: ruby_1_9_3/test/webrick/test_filehandler.rb
===================================================================
--- ruby_1_9_3/test/webrick/test_filehandler.rb	(revision 36833)
+++ ruby_1_9_3/test/webrick/test_filehandler.rb	(revision 36834)
@@ -252,7 +252,7 @@
         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
       },

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/