diff options
| author | Sergey Nartimov <just.lest@gmail.com> | 2011-12-25 14:34:58 +0300 |
|---|---|---|
| committer | Sergey Nartimov <just.lest@gmail.com> | 2011-12-25 14:34:58 +0300 |
| commit | 1e9e88fcd335c7d5a99159d592c3e1b605510a16 (patch) | |
| tree | d4ccf417d4ed7c999b574ba941cf9ecb68f7882c /actionpack/lib/action_dispatch | |
| parent | 4c1701c0ca6ae77a8274f59460751d1b1d83ce1b (diff) | |
| download | rails-1e9e88fcd335c7d5a99159d592c3e1b605510a16.tar.gz rails-1e9e88fcd335c7d5a99159d592c3e1b605510a16.tar.bz2 rails-1e9e88fcd335c7d5a99159d592c3e1b605510a16.zip | |
remove checks for encodings availability
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 820921252d..0a0ebe7fad 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -189,7 +189,7 @@ module ActionDispatch # variable is already set, wrap it in a StringIO. def body if raw_post = @env['RAW_POST_DATA'] - raw_post.force_encoding(Encoding::BINARY) if raw_post.respond_to?(:force_encoding) + raw_post.force_encoding(Encoding::BINARY) StringIO.new(raw_post) else @env['rack.input'] diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb index f75b4d4d04..6a8e690d18 100644 --- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb @@ -30,7 +30,7 @@ module ActionDispatch def generate_sid sid = SecureRandom.hex(16) - sid.encode!('UTF-8') if sid.respond_to?(:encode!) + sid.encode!('UTF-8') sid end |