Merge 9.0

1 files changed, 26 insertions, 2 deletions

diff --git a/tests/http.test b/tests/http.test
index 3b2963e..aeb1029 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -113,6 +113,27 @@ test http-1.6 {http::config} -setup {
 test http-2.1 {http::reset} {
     catch {http::reset http#1}
 } 0
+test http-2.2 {http::CharsetToEncoding} {
+    http::CharsetToEncoding iso-8859-11
+} iso8859-11
+test http-2.3 {http::CharsetToEncoding} {
+    http::CharsetToEncoding iso-2022-kr
+} iso2022-kr
+test http-2.4 {http::CharsetToEncoding} {
+    http::CharsetToEncoding shift-jis
+} shiftjis
+test http-2.5 {http::CharsetToEncoding} {
+    http::CharsetToEncoding windows-437
+} cp437
+test http-2.6 {http::CharsetToEncoding} {
+    http::CharsetToEncoding latin5
+} iso8859-9
+test http-2.7 {http::CharsetToEncoding} {
+    http::CharsetToEncoding latin1
+} iso8859-1
+test http-2.8 {http::CharsetToEncoding} {
+    http::CharsetToEncoding latin4
+} binary
 
 test http-3.1 {http::geturl} -returnCodes error -body {
     http::geturl -bogus flag
@@ -655,15 +676,18 @@ test http-7.2 {http::mapReply} {
 test http-7.3 {http::formatQuery} -setup {
     set enc [http::config -urlencoding]
 } -returnCodes error -body {
-    # this would be reverting to http <=2.4 behavior
+    # -urlencoding "" no longer supported. Use "iso8859-1".
     http::config -urlencoding ""
     http::mapReply "∈"
 } -cleanup {
     http::config -urlencoding $enc
-} -result "can't read \"formMap(∈)\": no such element in array"
+} -result {unknown encoding ""}
 test http-7.4 {http::formatQuery} -setup {
     set enc [http::config -urlencoding]
 } -body {
+    # this would be reverting to http <=2.4 behavior w/o errors
+    # with Tcl 8.x (unknown chars become '?'), generating a 
+    # proper exception with Tcl 9.0
     http::config -urlencoding "iso8859-1"
     http::mapReply "∈"
 } -cleanup {