@@ -296,11 +296,12 @@
 						;; (tasks:kill-server-run-id run-id)  ;; better to kill the server in the logic that called this routine?
 						(mutex-unlock! *http-mutex*)
 						;; (signal (make-composite-condition
 						;;          (make-property-condition 'commfail 'message "failed to connect to server")))
 						;; "communications failed"
-						(close-all-connections!)
+						;; (close-all-connections!)
+						(close-connection! fullurl)
 						(db:obj->string #f))
 					      (with-input-from-request ;; was dat
 					       fullurl 
 					       (list (cons 'key (or server-id   "thekey"))
 						     (cons 'cmd cmd)
@@ -357,12 +358,14 @@
 	  (handle-exceptions
 	    exn
 	    (begin
 	      (print-call-chain *default-log-port*)
 	      (debug:print-error 0 *default-log-port* " closing connection failed with error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
+	    (if (args:any-defined? "-server" "-execute" "-run")
+		(debug:print-info 0 *default-log-port* "Closing connections to "api-dat))
 	    (close-connection! api-dat)
-            (close-idle-connections!)
+	    (close-connection! (http-transport:server-dat-make-url server-dat))
 	    (remote-conndat-set! runremote #f)
 	    #t))
 	#f)))