summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/webrick/https.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c7cb1478c..bb7478ee90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 21 01:43:01 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/webrick/https.rb: uninitialized instance variables.
+ Backport a part of r20864 for ruby_1_8.
+
Sat Dec 4 11:35:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (init_mkmf): needs default library path even if
diff --git a/lib/webrick/https.rb b/lib/webrick/https.rb
index 81b65ce803..8ad89f85dc 100644
--- a/lib/webrick/https.rb
+++ b/lib/webrick/https.rb
@@ -21,6 +21,7 @@ module WEBrick
alias orig_parse parse
def parse(socket=nil)
+ @cipher = @server_cert = @client_cert = nil
if socket.respond_to?(:cert)
@server_cert = socket.cert || @config[:SSLCertificate]
@client_cert = socket.peer_cert