Index: openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl	20 May 2018 11:30:55 -0000	1.17
+++ openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl	22 Jun 2018 13:09:10 -0000	1.18
@@ -1353,7 +1353,7 @@
         }
 
         set enc [util::http::get_channel_settings $content_type]
-        if {$enc ne "binary"} {
+        if {$enc ni [list "binary" [encoding system]]} {
             set body [encoding convertto $enc $body]
         }
 
@@ -1455,7 +1455,7 @@
 
     # Translate into proper encoding
     set enc [util::http::get_channel_settings $content_type]
-    if {$enc ne "binary"} {
+    if {$enc ni [list "binary" [encoding system]]} {
         set page [encoding convertfrom $enc $page]
     }
 
@@ -1660,7 +1660,7 @@
         }
 
         set enc [util::http::get_channel_settings $content_type]
-        if {$enc ne "binary"} {
+        if {$enc ni [list "binary" [encoding system]]} {
             set body [encoding convertto $enc $body]
         }
 
@@ -1808,7 +1808,7 @@
 
     # Translate into proper encoding
     set enc [util::http::get_channel_settings $content_type]
-    if {$enc ne "binary"} {
+    if {$enc ni [list "binary" [encoding system]]} {
         set page [encoding convertfrom $enc $page]
     }