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
commit8454e2b25f4aea51fabeca920251e6f948242cd3 (patch)
treeb61f31c04c8b02228a23cedc785daaf5030fc044
parenta01db161819c2c734881d226880bfb4325843513 (diff)
downloadruby-8454e2b25f4aea51fabeca920251e6f948242cd3.tar.gz
ruby-8454e2b25f4aea51fabeca920251e6f948242cd3.tar.xz
ruby-8454e2b25f4aea51fabeca920251e6f948242cd3.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/trunk@6804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/webrick/httpproxy.rb3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 78a8846e2..e476a8b79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 22 01:10:36 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.
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