Skip to content

Commit

Permalink
Tagged the 0.9.1 release
Browse files Browse the repository at this point in the history
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@204 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Dec 17, 2004
1 parent 0f3c6b1 commit 974ed23
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions actionpack/lib/action_controller/base.rb
Expand Up @@ -431,7 +431,7 @@ def render_text(text = nil, status = nil, &block) #:doc:
# http://www.mnot.net/cache_docs/ for an overview of web caching and
# http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
# for the Cache-Control header spec.
def send_file(path, options = {})
def send_file(path, options = {}) #:doc:
raise MissingFile unless File.file?(path) and File.readable?(path)

options[:length] ||= File.size(path)
Expand Down Expand Up @@ -483,7 +483,7 @@ def send_file(path, options = {})
# send_data image.data, :type => image.content_type, :disposition => 'inline'
#
# See +send_file+ for more information on HTTP Content-* headers and caching.
def send_data(data, options = {})
def send_data(data, options = {}) #:doc:
logger.info "Sending data #{options[:filename]}" unless logger.nil?
send_file_headers! options.merge(:length => data.size)
render_text data
Expand Down

0 comments on commit 974ed23

Please sign in to comment.