fix res.charset appending charset when exists
2.17.1
Merge tag '2.17.1'