deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Security: Update to Rails 2.3.14

Browse source
This commit is contained in:
Jacques Distler 2011-08-19 01:54:58 -05:00
parent 3c650f2cf6
commit 4b2448b09a
26 changed files with 106 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
vendor/rails/actionpack/lib/action_controller/response.rb vendored
View file

@ -64,12 +64,13 @@ module ActionController # :nodoc:
# the character set information will also be included in the content type
# information.
def content_type=(mime_type)
self.headers["Content-Type"] =
new_content_type =
if mime_type =~ /charset/ || (c = charset).nil?
mime_type.to_s
else
"#{mime_type}; charset=#{c}"
end
self.headers["Content-Type"] = URI.escape(new_content_type, "\r\n")
end
# Returns the response's content MIME type, or nil if content type has been set.

2
vendor/rails/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb vendored
View file

@ -162,7 +162,7 @@ module HTML #:nodoc:
end
closing = ( scanner.scan(/\//) ? :close : nil )
return Text.new(parent, line, pos, content) unless name = scanner.scan(/[-:\w\x00-\x09\x0b-\x0c\x0e-\x1f]+/)
return Text.new(parent, line, pos, content) unless name = scanner.scan(/[^\s!>\/]+/)
name.downcase!
unless closing