diff options
| author | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-03-30 09:31:14 +0000 |
|---|---|---|
| committer | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-03-30 09:31:14 +0000 |
| commit | b87e5685a25acc5b9bb08dcbb811e58718068273 (patch) | |
| tree | 6e8614e3a668a122094e399800636e5c589b58bb /lib/mongrel/handlers.rb | |
| parent | 57ff055decb205ef18da1e5a9d6f21372cb9878d (diff) | |
| download | unicorn-b87e5685a25acc5b9bb08dcbb811e58718068273.tar.gz | |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@132 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel/handlers.rb')
| -rw-r--r-- | lib/mongrel/handlers.rb | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/lib/mongrel/handlers.rb b/lib/mongrel/handlers.rb index 1b2a7d4..b308194 100644 --- a/lib/mongrel/handlers.rb +++ b/lib/mongrel/handlers.rb @@ -84,6 +84,7 @@ module Mongrel ".txt" => "text/plain" } + ONLY_HEAD_GET="Only HEAD and GET allowed.".freeze attr_reader :path @@ -134,7 +135,7 @@ module Mongrel if @listing_allowed response.start(200) do |head,out| - head['Content-Type'] = "text/html" + head[Const::CONTENT_TYPE] = "text/html" out << "<html><head><title>Directory Listing</title></head><body>" Dir.entries(dir).each do |child| next if child == "." @@ -167,7 +168,12 @@ module Mongrel if dot_at ext = req[dot_at .. -1] if MIME_TYPES[ext] - response.header['Content-Type'] = MIME_TYPES[ext] + stat = File.stat(req) + response.header[Const::CONTENT_TYPE] = MIME_TYPES[ext] + # TODO: Confirm this works for rfc 1123 + response.header[Const::LAST_MODIFIED] = HttpServer.httpdate(stat.mtime) + # TODO that this is a valid way to calculate an etag + response.header[Const::ETAG] = Const::ETAG_FORMAT % [stat.mtime.to_i, stat.size, stat.ino] end end @@ -193,8 +199,8 @@ module Mongrel # Process the request to either serve a file or a directory listing # if allowed (based on the listing_allowed paramter to the constructor). def process(request, response) - req_method = request.params['REQUEST_METHOD'] || "GET" - req = can_serve request.params['PATH_INFO'] + req_method = request.params[Const::REQUEST_METHOD] || Const::GET + req = can_serve request.params[Const::PATH_INFO] if not req # not found, return a 404 response.start(404) do |head,out| @@ -203,13 +209,13 @@ module Mongrel else begin if File.directory? req - send_dir_listing(request.params["REQUEST_URI"],req, response) - elsif req_method == "HEAD" + send_dir_listing(request.params[Const::REQUEST_URI],req, response) + elsif req_method == Const::HEAD send_file(req, response, true) - elsif req_method == "GET" + elsif req_method == Const::GET send_file(req, response, false) else - response.start(403) {|head,out| out.write("Only HEAD and GET allowed.") } + response.start(403) {|head,out| out.write(ONLY_HEAD_GET) } end rescue => details STDERR.puts "Error accessing file #{req}: #{details}" |