summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--sample/webrick/httpsd.rb4
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2a1ec04bb..66d2eeb52c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.