1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d3ba13ac1..92fafd9451 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jul 23 01:41:29 2016  Eric Wong  <[email protected]>
+
+	* lib/webrick/httpservlet/cgihandler.rb (do_GET): delete HTTP_PROXY
+	* test/webrick/test_cgi.rb (test_cgi_env): new test
+	* test/webrick/webrick.cgi (do_GET): new endpoint to dump env
+	  [ruby-core:76511] [Bug #12610]
+
 Fri Jul 22 19:55:20 2016  Nobuyoshi Nakada  <[email protected]>
 
 	* vm.c (vm_set_main_stack): remove unnecessary check.  toplevel