Minor Fixes

Get rid of Redefined CONSTANT warning.
Make WEBrick respond to TERM signal. (Launchd, in particular, requires this.)
Rollback superfluous change to rails/actionpack/lib/action_controller/base.rb. Handled by the action_cache plugin.

app/controllers/application.rb

@@ -206,7 +206,7 @@ end
 module Mime
   # Fix HTML
   #HTML  = Type.new "text/html", :html, %w( application/xhtml+xml )
-  HTML  = Type.new "text/html", :html
+  self.class.const_set("HTML", Type.new("text/html", :html) )
 
   # Add XHTML
   XHTML  = Type.new "application/xhtml+xml", :xhtml

vendor/rails/actionpack/lib/action_controller/base.rb

@@ -829,14 +829,6 @@ module ActionController #:nodoc:
         else
           response.body = text
         end
-        if response.headers['Status'] == "200 OK" && response.body.size > 0 
-          response.headers['Etag'] = "\"#{MD5.new(text).to_s}\"" 
-           
-          if request.headers['HTTP_IF_NONE_MATCH'] == response.headers['Etag'] 
-            response.headers['Status'] = "304 Not Modified" 
-            response.body = '' 
-          end 
-        end 
          
         response.body 
       end

vendor/rails/railties/lib/webrick_server.rb

@@ -59,6 +59,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
     server.mount('/', DispatchServlet, options)
 
     trap("INT") { server.shutdown }
+    trap("TERM") { server.shutdown }
     
     server.start
   end