Changeset 814
- Timestamp:
- 11/02/07 21:42:05 (1 year ago)
- Files:
-
- trunk/app_generators/merb/templates/spec/spec.opts (added)
- trunk/lib/merb/mixins/controller.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/merb/mixins/controller.rb
r666 r814 151 151 # :type => content_type, 152 152 # :content_length => content_length }) do 153 # response.send_status(opts[:content_length])154 # response.send_header155 153 # AWS::S3::S3Object.stream(user.folder_name + "-" + user_file.unique_id, bucket_name) do |chunk| 156 # @response.write chunk154 # response.write chunk 157 155 # end 158 156 # end … … 167 165 'CONTENT-LENGTH' => opts[:content_length] 168 166 ) 167 response.send_status(opts[:content_length]) 168 response.send_header 169 169 stream 170 170 end
