upstream merge
This commit is contained in:
commit
0379d5d1ed
|
@ -28,7 +28,7 @@ module Landline
|
|||
# Decode charset parameter
|
||||
def decode(data)
|
||||
data = Landline::Util.unescape_html(data)
|
||||
return data unless self.headers['charset']
|
||||
return data.force_encoding("UTF-8") unless self.headers['charset']
|
||||
|
||||
data.force_encoding(self.headers['charset']).encode("UTF-8")
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue