diff --git a/ChangeLog b/ChangeLog
index 78a8846e28..e476a8b79e 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 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