aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-13 11:41:13 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-13 11:41:13 +0000
commit3d7147bcea7323a6dd2dbfc0c02c442c7f2caa39 (patch)
treea640050373148ee7e6b0230a0e7dc3d8097373e7
parentc791dc1345ad8ebe7b707e8922b42a7a43c53b89 (diff)
downloadruby-3d7147bcea7323a6dd2dbfc0c02c442c7f2caa39.tar.gz
* lib/webrick/https.rb (HTTPServer#run): should set syncing-mode
to SSLSocket. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/webrick/https.rb1
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ecd320314..775c67b3d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 13 19:21:34 2003 Christian Neukirchen <chneukirchen@yahoo.de>
+
+ * lib/webrick/https.rb (HTTPServer#run): should set syncing-mode
+ to SSLSocket.
+
Wed Aug 13 18:13:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (POP_BLOCK): turn on BLOCK_LEFT flag when leaving block.
@@ -62,7 +67,7 @@ Sun Aug 10 10:43:05 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
from 1k to 16k bytes. [ruby-talk:78603]
* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): enable
- partial write to allow interruption in SSLSocket#sysread.
+ partial write to allow interruption in SSLSocket#write.
Sun Aug 10 00:34:16 2003 WATANABE Hirofumi <eban@ruby-lang.org>
diff --git a/lib/webrick/https.rb b/lib/webrick/https.rb
index 2038540ecc..fa8c667d2a 100644
--- a/lib/webrick/https.rb
+++ b/lib/webrick/https.rb
@@ -129,6 +129,7 @@ module WEBrick
def run(sock)
if @config[:SSLEnable]
ssl = OpenSSL::SSL::SSLSocket.new(sock, @ctx)
+ ssl.sync = true
ssl.accept
Thread.current[:WEBrickSocket] = ssl
orig_run(ssl)