diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-07 12:35:41 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-07 12:35:41 +0000 |
| commit | df2e47fe44146535a8d85d66836906643831b1d8 (patch) | |
| tree | a8aa04867b65a867030415cacd39dbcced3776f2 | |
| parent | 24cb3707eb4abc3060e234cb0927edde3ff0b0ad (diff) | |
* lib/webrick/server.rb (WEBrick::GenericServer#start): should
restore @token if accept failure. suggested by Dominique Brezinski.
[ruby-core:04518]
* sample/webrick/httpsd.rb: fix typo in comment. suggested by
Kazuhiko Shiozaki.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sample/webrick/httpsd.rb | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Mon Mar 7 21:35:02 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> + + * lib/webrick/server.rb (WEBrick::GenericServer#start): should + restore @token if accept failure. suggested by Dominique Brezinski. + [ruby-core:04518] + + * sample/webrick/httpsd.rb: fix typo in comment. suggested by + Kazuhiko Shiozaki. + Wed Feb 16 02:55:21 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read, diff --git a/sample/webrick/httpsd.rb b/sample/webrick/httpsd.rb index 9d82ef36cf..a120782c3c 100644 --- a/sample/webrick/httpsd.rb +++ b/sample/webrick/httpsd.rb @@ -11,8 +11,8 @@ httpd = WEBrick::HTTPServer.new( :SSLEnable => true, # Specify key pair and server certificate. - # :SSLPrivateKey => OpenSSL::PKey::RSA.new("server.key"), - # :SSLCertificate => OpenSSL::X509::Certificate.new("server.crt"), + # :SSLPrivateKey => OpenSSL::PKey::RSA.new(File.read("server.key")), + # :SSLCertificate => OpenSSL::X509::Certificate.new(File.read("server.crt")), # specify the following SSL options if you want to use auto # generated self-signed certificate. |