diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-17 17:19:05 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-17 17:19:05 +0000 |
| commit | 974ed23034707320efe35ca3a4bd3e538a082bc3 (patch) | |
| tree | 07305c47b460d2eae9163628d435472597b3df89 | |
| parent | 0f3c6b179c92a0faf4fc1dd10a88f040752008e4 (diff) | |
| download | rails-974ed23034707320efe35ca3a4bd3e538a082bc3.tar.gz rails-974ed23034707320efe35ca3a4bd3e538a082bc3.tar.bz2 rails-974ed23034707320efe35ca3a4bd3e538a082bc3.zip | |
Tagged the 0.9.1 release
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@204 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 1eb32d2152..82daf608c6 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -431,7 +431,7 @@ module ActionController #:nodoc: # 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) @@ -483,7 +483,7 @@ module ActionController #:nodoc: # 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 |