1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backport webrick patch for CVE-2020-25613

Browse Source 
[Backport #17201]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2021-02-16 13:35:19 +00:00
parent eb91b22ed0
commit d6d2f179b0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/webrick/httprequest.rb
View File

@ -226,9 +226,9 @@ module WEBrick
raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'." raise HTTPStatus::BadRequest, "bad URI `#{@unparsed_uri}'."
end end
if /close/io =~ self["connection"] if /\Aclose\z/io =~ self["connection"]
@keep_alive = false @keep_alive = false
elsif /keep-alive/io =~ self["connection"] elsif /\Akeep-alive\z/io =~ self["connection"]
@keep_alive = true @keep_alive = true
elsif @http_version < "1.1" elsif @http_version < "1.1"
@keep_alive = false @keep_alive = false
@ -475,7 +475,7 @@ module WEBrick
return unless socket return unless socket
if tc = self['transfer-encoding'] if tc = self['transfer-encoding']
case tc case tc
when /chunked/io then read_chunked(socket, block) when /\Achunked\z/io then read_chunked(socket, block)
else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}." else raise HTTPStatus::NotImplemented, "Transfer-Encoding: #{tc}."
end end
elsif self['content-length'] || @remaining_size elsif self['content-length'] || @remaining_size

2
lib/webrick/version.rb
View File

@ -14,5 +14,5 @@ module WEBrick
## ##
# The WEBrick version # The WEBrick version
VERSION = "1.4.2" VERSION = "1.4.2.1"
end end

10
version.h
View File

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.5.9" #define RUBY_VERSION "2.5.9"
#define RUBY_RELEASE_DATE "2020-12-09" #define RUBY_RELEASE_DATE "2021-02-16"
#define RUBY_PATCHLEVEL 227 #define RUBY_PATCHLEVEL 228
#define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 9 #define RUBY_RELEASE_DAY 16
#include "ruby/version.h" #include "ruby/version.h"