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

* lib/webrick/httprequest.rb (meta_vers): should not set

Browse Source 
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:
gotoyuzo 2003-12-19 14:31:24 +00:00
parent c1e9ce9ca6
commit a4874e20ae
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Dec 19 21:24:22 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* 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.
Fri Dec 19 22:56:46 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> Fri Dec 19 22:56:46 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/soap/property.rb (SOAP::Property#load): new method for loading * lib/soap/property.rb (SOAP::Property#load): new method for loading

2
lib/webrick/httprequest.rb
View File

@ -190,6 +190,8 @@ module WEBrick
meta["SERVER_SOFTWARE"] = @config[:ServerSoftware].dup meta["SERVER_SOFTWARE"] = @config[:ServerSoftware].dup
self.each{|key, val| self.each{|key, val|
next if /content-type/ =~ key
next if /content-length/ =~ key
name = "HTTP_" + key name = "HTTP_" + key
name.gsub!(/-/o, "_") name.gsub!(/-/o, "_")
name.upcase! name.upcase!

4
lib/webrick/https.rb
View File

@ -21,8 +21,8 @@ module WEBrick
alias orig_parse parse alias orig_parse parse
def parse(socket=nil) def parse(socket=nil)
if socket && socket.is_a?(OpenSSL::SSL::SSLSocket) if socket.respond_to?(:cert)
@server_cert = @config[:SSLCertificate] @server_cert = socket.cert || @config[:SSLCertificate]
@client_cert = socket.peer_cert @client_cert = socket.peer_cert
@client_cert_chain = socket.peer_cert_chain @client_cert_chain = socket.peer_cert_chain
@cipher = socket.cipher @cipher = socket.cipher