Index: openacs-4/packages/acs-automated-testing/tcl/http.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/http.tcl,v
diff -u -r1.2.2.3 -r1.2.2.4
--- openacs-4/packages/acs-automated-testing/tcl/http.tcl	10 Sep 2015 08:21:14 -0000	1.2.2.3
+++ openacs-4/packages/acs-automated-testing/tcl/http.tcl	20 Oct 2015 08:01:06 -0000	1.2.2.4
@@ -361,9 +361,10 @@
     foreach {flag value} $args {
 	if {[regexp $pat $flag]} {
 	    # Validate numbers
-	    if {[info exists state($flag)] && \
-		    [string is integer -strict $state($flag)] && \
-		    ![string is integer -strict $value]} {
+	    if {[info exists state($flag)]
+                && [string is integer -strict $state($flag)]
+                && ![string is integer -strict $value]
+            } {
 		unset $token
 		return -code error "Bad value for $flag ($value), must be integer"
 	    }
@@ -842,17 +843,20 @@
             # We have to use binary translation to count bytes properly.
             fconfigure $s -translation binary
 
-	    if {$state(-binary) || ![string match -nocase text* $state(type)]
-		    || [string match "*gzip*" $state(coding)]
-		    || [string match "*compress*" $state(coding)]} {
+	    if {$state(-binary)
+                || ![string match -nocase text* $state(type)]
+                || [string match "*gzip*" $state(coding)]
+                || [string match "*compress*" $state(coding)]
+            } {
 		# Turn off conversions for non-text data
                 set state(binary) 1
 		if {[info exists state(-channel)]} {
 		    fconfigure $state(-channel) -translation binary
 		}
 	    }
-	    if {[info exists state(-channel)] && \
-		    ![info exists state(-handler)]} {
+	    if {[info exists state(-channel)]
+                && ![info exists state(-handler)]
+            } {
 		# Initiate a sequence of background fcopies
 		fileevent $s readable {}
 		CopyStart $s $token
@@ -1149,8 +1153,9 @@
 proc http::ProxyRequired {host} {
     variable http
     if {[info exists http(-proxyhost)] && [string length $http(-proxyhost)]} {
-	if {![info exists http(-proxyport)] || \
-		$http(-proxyport) eq ""} {
+	if {![info exists http(-proxyport)]
+            || $http(-proxyport) eq ""
+        } {
 	    set http(-proxyport) 8080
 	}
 	return [list $http(-proxyhost) $http(-proxyport)]