summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-28 14:50:27 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-28 14:50:27 +0000
commitbbda1a027475bf7ce5e1a9583a7b55d0be71c8fe (patch)
tree8dafb58b6ec6a18c1516d31ba53036af6128f4ea /ChangeLog
parenta45622669bb1ff18d3ee9b411128acd839c4263e (diff)
merge revision(s) 62968:ruby_2_2
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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@63022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
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