1 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 57e4e8b24a..0d1ac86000 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Mar 28 23:48:24 2018  Eric Wong  <normalperson@yhbt.net>
+
+	webrick: prevent response splitting and header injection
+
+	Original patch by tenderlove (with minor style adjustments).
+
+	* lib/webrick/httpresponse.rb (send_header): call check_header
+	  (check_header): raise on embedded CRLF in header value
+	* test/webrick/test_httpresponse.rb
+	  (test_prevent_response_splitting_headers): new test
+	* (test_prevent_response_splitting_cookie_headers): ditto
+
 Wed Mar 28 23:45:36 2018  Eric Wong  <normalperson@yhbt.net>
 
 	webrick: use IO.copy_stream for multipart response