From 24dd0c2fafa1f890e360ff62d5b462b4a583de01 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Sat, 21 Aug 2004 16:16:18 +0000 Subject: [PATCH] * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect): should call :ProxyContentHandler before finishing CONNECT. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++++- lib/webrick/httpproxy.rb | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e49e618ca3..8693401e60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Aug 22 01:15:31 2004 GOTOU Yuuzou + + * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect): + should call :ProxyContentHandler before finishing CONNECT. + Sat Aug 21 06:41:16 2004 Nobuyoshi Nakada * 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 Wed Aug 18 23:41:33 2004 Minero Aoki - * 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 diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb index c3bbbc54be..65f830ecbb 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