aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-06-07 17:00:09 -0400
committerwycats <wycats@gmail.com>2010-06-07 18:06:08 -0400
commitd6953cbfd3b6e06eceba715c60e288b6d7db0d49 (patch)
tree0e54acc2ae35e985cd8c8175f051e281acbd4595 /actionpack/lib/action_controller
parenta210aff210616922063c89680219bb45581cc217 (diff)
downloadrails-d6953cbfd3b6e06eceba715c60e288b6d7db0d49.tar.gz
rails-d6953cbfd3b6e06eceba715c60e288b6d7db0d49.tar.bz2
rails-d6953cbfd3b6e06eceba715c60e288b6d7db0d49.zip
regular expressions are usually ASCII-encoded, so force_encoding the content of a Node to the encoding of the regular expression is wrong.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb1
1 files changed, 1 insertions, 0 deletions
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