summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-21 16:16:18 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-21 16:16:18 +0000
commita15a67ea7f0ef303dcdf5266d622a2f0fcf00683 (patch)
treea035624551b22e1878390274e023741a93f60b73
parentc74acfd4011f68e82043d525515c563b9a11ed58 (diff)
downloadruby-a15a67ea7f0ef303dcdf5266d622a2f0fcf00683.tar.gz
ruby-a15a67ea7f0ef303dcdf5266d622a2f0fcf00683.tar.xz
ruby-a15a67ea7f0ef303dcdf5266d622a2f0fcf00683.zip
* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
should call :ProxyContentHandler before finishing CONNECT. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/webrick/httpproxy.rb3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e49e618ca..8693401e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 22 01:15:31 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
+ should call :ProxyContentHandler before finishing CONNECT.
+
Sat Aug 21 06:41:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tcltklib/extconf.rb (find_tcl, find_tk): find stub library.
@@ -39,7 +44,7 @@ Thu Aug 19 06:07:45 2004 why the lucky stiff <why@ruby-lang.org>
Wed Aug 18 23:41:33 2004 Minero Aoki <aamine@loveruby.net>
- * lib/net/protocol.rb (rbuf_fill): OpenSSL::SSLSocket has its own
+ * lib/net/protocol.rb (rbuf_fill): OpenSSL::SSL::SSLSocket has its own
buffer, select(2) might not work. [ruby-dev:24072]
Wed Aug 18 17:10:12 2004 WATANABE Hirofumi <eban@ruby-lang.org>
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
index c3bbbc54b..65f830ecb 100644
--- a/lib/webrick/httpproxy.rb
+++ b/lib/webrick/httpproxy.rb
@@ -206,6 +206,9 @@ module WEBrick
res.set_error(ex)
raise HTTPStatus::EOFError
ensure
+ if handler = @config[:ProxyContentHandler]
+ handler.call(req, res)
+ end
res.send_response(ua)
access_log(@config, req, res)
end