mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/webrick/httprequest.rb (meta_vers): should not set
HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH. * lib/webrick/https.rb (HTTPRequest#parse): should check presence of cert() method to detect SSLSocket. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c1e9ce9ca6
commit
a4874e20ae
3 changed files with 12 additions and 2 deletions
|
|
@ -190,6 +190,8 @@ module WEBrick
|
|||
meta["SERVER_SOFTWARE"] = @config[:ServerSoftware].dup
|
||||
|
||||
self.each{|key, val|
|
||||
next if /content-type/ =~ key
|
||||
next if /content-length/ =~ key
|
||||
name = "HTTP_" + key
|
||||
name.gsub!(/-/o, "_")
|
||||
name.upcase!
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ module WEBrick
|
|||
alias orig_parse parse
|
||||
|
||||
def parse(socket=nil)
|
||||
if socket && socket.is_a?(OpenSSL::SSL::SSLSocket)
|
||||
@server_cert = @config[:SSLCertificate]
|
||||
if socket.respond_to?(:cert)
|
||||
@server_cert = socket.cert || @config[:SSLCertificate]
|
||||
@client_cert = socket.peer_cert
|
||||
@client_cert_chain = socket.peer_cert_chain
|
||||
@cipher = socket.cipher
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue