Merge remote branch 'rails/master'

2 files changed, 9 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 10c7ca9021..c465035ca1 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -16,5 +16,13 @@ module ActionController
       raise "In order to use #url_for, you must include the helpers of a particular " \
             "router. For instance, `include Rails.application.routes.url_helpers"
     end
+
+    module ClassMethods
+      def action_methods
+        @action_methods ||= begin
+          super - _router.named_routes.helper_names
+        end
+      end
+    end
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
index 602411ed37..064ff3724d 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
@@ -23,6 +23,7 @@ module HTML #:nodoc:
     
     # Create a new Tokenizer for the given text.
     def initialize(text)
+      text.encode! if text.encoding_aware?
       @scanner = StringScanner.new(text)
       @position = 0
       @line = 0