diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-12 02:46:40 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-12 02:46:40 +0000 |
| commit | 26df8ea5bb613bcef93c4db0a8772099b5217d37 (patch) | |
| tree | b64c2d8e83bf87b511bf8184b5a933c98fad37f6 /lib | |
| parent | 9bfab3c125ed490cbbb838b915420880a59171ad (diff) | |
merge revision(s) 55581,55582: [Backport #12557]
* lib/net/http/generic_rquest.rb (write_header): A Request-Line must
not contain CR or LF.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/http/generic_request.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb index 00ff434ccf..959a3c6510 100644 --- a/lib/net/http/generic_request.rb +++ b/lib/net/http/generic_request.rb @@ -320,7 +320,12 @@ class Net::HTTPGenericRequest end def write_header(sock, ver, path) - buf = "#{@method} #{path} HTTP/#{ver}\r\n" + reqline = "#{@method} #{path} HTTP/#{ver}" + if /[\r\n]/ =~ reqline + raise ArgumentError, "A Request-Line must not contain CR or LF" + end + buf = "" + buf << reqline << "\r\n" each_capitalized do |k,v| buf << "#{k}: #{v}\r\n" end |