Make sure last_modified! works with <= rather than just equality.

2 files changed, 9 insertions, 1 deletions

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 413f6d48e5..3ede681253 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -969,7 +969,9 @@ module ActionController #:nodoc:
       # If-Modified-Since request header is <= last modified.
       def last_modified!(utc_time)
         response.last_modified= utc_time
-        head(:not_modified) if response.last_modified == request.if_modified_since
+        if request.if_modified_since && request.if_modified_since <= utc_time
+          head(:not_modified)
+        end
       end
 
       # Sets the ETag response header. Returns 304 Not Modified if the
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 5a6ca98b2e..7b8bb6856b 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1441,6 +1441,12 @@ class LastModifiedRenderTest < Test::Unit::TestCase
     get :conditional_hello_with_bangs
     assert_response :not_modified
   end
+
+  def test_last_modified_works_with_less_than_too
+    @request.if_modified_since = 5.years.ago.httpdate
+    get :conditional_hello_with_bangs
+    assert_response :not_modified
+  end
 end
 
 class RenderingLoggingTest < Test::Unit::TestCase