aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-06 00:01:20 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-06 00:01:20 +0000
commit0619e732023fb3a409949b142b0f83cf73af01ef (patch)
tree4a534146320afd168a4600c91e9ceb06316560e3 /lib
parent9c562965116f89cb53490bed58725baa9091cedd (diff)
downloadruby-0619e732023fb3a409949b142b0f83cf73af01ef.tar.gz
* 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/trunk@55581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/http/generic_request.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb
index 19602da27c..6c5ceafe61 100644
--- a/lib/net/http/generic_request.rb
+++ b/lib/net/http/generic_request.rb
@@ -321,7 +321,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