Merged updates into stable branch

diff --git a/config/environment.rb b/config/environment.rb
index ff450c786fb987c7d0b3c72818ebefd2e3c53a4f..8c6dee4e597b5c68f55215da2ccd5f8f7e64e0f7 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+# RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 27119d2d18b413cdb697ac890555cef3853be24c..a3f3c4a3f8d8efabb7c755f14155833bc0b40e1a 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -15,6 +15,9 @@ config.action_view.cache_template_loading            = true
 # Use a different logger for distributed setups
 # config.logger = SyslogLogger.new
 
+# Rotate logs when the file grows to 10Mb, keep 10 old log files
+config.logger = Logger.new(config.log_path, 10, 10.megabytes)
+
 # Use a different cache store in production
 # config.cache_store = :mem_cache_store
 

diff --git a/config/routes.rb b/config/routes.rb
index 1240ec454b96f800e8a3dcfff658bd9159767a21..75eb181d1231adf4e45cdfed1e927f47412d52f4 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -38,12 +38,16 @@ ActionController::Routing::Routes.draw do |map|
     :conditions => { :method => :get },
     :controller => 'feed',
     :action => 'show'
-  map.update ':ignored',
+  map.update '*ignored',
     :conditions => { :method => :post },
-    :defaults => { :ignored => nil },
+    #:defaults => { :ignored => nil },
     :controller => 'feed',
     :action => 'update'
 
+  map.connect '*ignored',
+    :controller => 'feed',
+    :action => 'index'
+
   # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
   map.root :controller => "feed"
 

diff --git a/heaaders.txt b/heaaders.txt
deleted file mode 100644 (file)
index bd7c636..0000000
--- a/heaaders.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 200 OK \r
-Cache-Control: private, max-age=0, must-revalidate\r
-Connection: Keep-Alive\r
-Date: Wed, 22 Jul 2009 12:44:26 GMT\r
-Content-Type: application/rss+xml; charset=utf-8\r
-Etag: "e7d0d2fad560d3d17bc9fa379dff26d7"\r
-Server: WEBrick/1.3.1 (Ruby/1.8.6/2007-09-24)\r
-X-Runtime: 33\r
-Content-Length: 710\r
-\r

diff --git a/headers.txt b/headers.txt
deleted file mode 100644 (file)
index 8ff770c..0000000
--- a/headers.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-HTTP/1.1 200 OK \r
-Cache-Control: private, max-age=0, must-revalidate\r
-Connection: Keep-Alive\r
-Date: Wed, 22 Jul 2009 12:46:46 GMT\r
-Content-Type: application/rss+xml; charset=utf-8\r
-Etag: "0fcd2f586381d34c341be820ea75fa9a"\r
-Server: WEBrick/1.3.1 (Ruby/1.8.6/2007-09-24)\r
-X-Runtime: 67\r
-Content-Length: 2528\r
-\r