diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-11 19:08:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-11 19:08:11 (GMT) |
| commit | 9beeb77bd585a1ea73c66d0c4161770fa57f9a98 (patch) | |
| tree | d62db7dde07790eb203e288a8f0b63cee9dd5362 /library | |
| parent | ab4dbed807fd9e13e45e34f6432ea902ff94bb0e (diff) | |
| parent | 6d44e5c0f77c03a6daaf47db88c752018d980055 (diff) | |
| download | tcl-9beeb77bd585a1ea73c66d0c4161770fa57f9a98.zip tcl-9beeb77bd585a1ea73c66d0c4161770fa57f9a98.tar.gz tcl-9beeb77bd585a1ea73c66d0c4161770fa57f9a98.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'library')
| -rw-r--r-- | library/http/http.tcl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl index 8bfec44..187d203 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -3590,7 +3590,7 @@ proc http::CharsetToEncoding {charset} { set encoding "iso8859-$num" } elseif {[regexp {iso-?2022-(jp|kr)} $charset -> ext]} { set encoding "iso2022-$ext" - } elseif {[regexp {shift[-_]?js} $charset]} { + } elseif {[regexp {shift[-_]?jis} $charset]} { set encoding "shiftjis" } elseif {[regexp {(?:windows|cp)-?([0-9]+)} $charset -> num]} { set encoding "cp$num" @@ -3602,6 +3602,9 @@ proc http::CharsetToEncoding {charset} { 1 - 2 - 3 { set encoding "iso8859-$num" } + default { + set encoding "binary" + } } } else { # other charset, like euc-xx, utf-8,... may directly map to encoding |