naruse	2012-06-11 19:57:46 +0900 (Mon, 11 Jun 2012)

  New Revision: 36031

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

  Log:
    merge revision(s) 33730: [Bug #6574]
    
    * test/webrick/test_cgi.rb (class TestWEBrickCGI): respect
      RbConfig::CONFIG["LIBPATHENV"]. [Bug #5135] [ruby-core:38653]
    
    * test/webrick/test_filehandler.rb (class WEBrick): 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 36030)
+++ ruby_1_9_3/ChangeLog	(revision 36031)
@@ -1,3 +1,9 @@
+Mon Jun 11 19:56:22 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* test/webrick/test_cgi.rb (class TestWEBrickCGI): respect
+	  RbConfig::CONFIG["LIBPATHENV"]. [Bug #5135] [ruby-core:38653]
+	* test/webrick/test_filehandler.rb (class WEBrick): ditto.
+
 Tue Jun  5 14:03:53 2012  Akinori MUSHA  <knu@i...>
 
 	* lib/ipaddr.rb: Inhibit zero-filled octets in an IPv4 address in
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36030)
+++ ruby_1_9_3/version.h	(revision 36031)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 235
+#define RUBY_PATCHLEVEL 236
 
-#define RUBY_RELEASE_DATE "2012-06-05"
+#define RUBY_RELEASE_DATE "2012-06-11"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/webrick/test_cgi.rb
===================================================================
--- ruby_1_9_3/test/webrick/test_cgi.rb	(revision 36030)
+++ ruby_1_9_3/test/webrick/test_cgi.rb	(revision 36031)
@@ -14,6 +14,7 @@
         def req.meta_vars
           meta = super
           meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
+          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[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 36030)
+++ ruby_1_9_3/test/webrick/test_filehandler.rb	(revision 36031)
@@ -252,6 +252,7 @@
         def req.meta_vars
           meta = super
           meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
+          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']]
           return meta
         end
       },

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