* test/xmlrpc/test_webrick_server.rb (setup_http_server):

  should not include 'webrick/https' unless 'use_ssl' because
  it fails where openssl is not installed.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 17 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index fdb39b3a6..380419833 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 20 05:50:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/xmlrpc/test_webrick_server.rb (setup_http_server):
+	  should not include 'webrick/https' unless 'use_ssl' because
+	  it fails where openssl is not installed.
+
 Tue Sep 20 00:34:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_close): call rb_io_close() directly if io is a T_FILE
diff --git a/test/xmlrpc/test_webrick_server.rb b/test/xmlrpc/test_webrick_server.rb
index e7fed016b..4cd63cfa7 100644
--- a/test/xmlrpc/test_webrick_server.rb
+++ b/test/xmlrpc/test_webrick_server.rb
@@ -33,13 +33,19 @@ class Test_Webrick < Test::Unit::TestCase
   end
 
   def setup_http_server(port, use_ssl)
-    require 'webrick/https'
-    start_server(
+    option = {
       :Port => port, 
       :SSLEnable => use_ssl,
-      :SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE, 
-      :SSLCertName => []
-      ) {|w| w.mount('/RPC2', create_servlet) }
+    }
+    if use_ssl
+      require 'webrick/https'
+      option.update(
+        :SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE, 
+        :SSLCertName => []
+      )
+    end
+
+    start_server(option) {|w| w.mount('/RPC2', create_servlet) }
 
     @s = XMLRPC::Client.new3(:port => port, :use_ssl => use_ssl)
   end