diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/xmlrpc/test_webrick_server.rb | 16 |
2 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Tue Sep 20 05:48:26 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 01:01:41 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/mathn.rb (Fixnum): remove debug print. diff --git a/test/xmlrpc/test_webrick_server.rb b/test/xmlrpc/test_webrick_server.rb index e7fed016b0..4cd63cfa74 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 |