Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -4652,11 +4652,12 @@
 					  (set! *task-db* #f)))))
 			      (if (and (not (args:get-arg "-server"))
 				       *runremote*)
 				  (begin
 				    (debug:print-info 0 *default-log-port* "Closing all client connections...")
-				    (http-client#close-all-connections!)))
+				    (http-transport:close-connections *runremote*)
+				    #;(http-client#close-all-connections!)))
                               ;; (if (and *runremote*
                               ;;          (remote-conndat *runremote*))
                               ;;     (begin
                               ;;       (http-client#close-all-connections!))) ;; for http-client
                               (if (not (eq? *default-log-port* (current-error-port)))

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -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)))
 
 

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -42,13 +42,12 @@
 ;;======================================================================
 
 ;; if a server is either running or in the process of starting call client:setup
 ;; else return #f to let the calling proc know that there is no server available
 ;;
-(define (rmt:get-connection-info areapath #!key (area-dat #f)) ;; TODO: push areapath down.
-  (let* ((runremote (or area-dat *runremote*))
-	 (cinfo     (if (remote? runremote)
+(define (rmt:get-connection-info areapath runremote) ;; TODO: push areapath down.
+  (let* ((cinfo     (if (remote? runremote)
 			(remote-conndat runremote)
 			#f)))
 	  (if cinfo
 	      cinfo
 	      (if (server:check-if-running areapath)
@@ -262,11 +261,11 @@
 	       (not (remote-conndat runremote))))           ;; and no connection
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case 9, hh-dat: " (remote-hh-dat runremote) " conndat: " (remote-conndat runremote))
       (mutex-unlock! *rmt-mutex*)
       (if (not (server:check-if-running *toppath*)) ;; who knows, maybe one has started up?
 	  (server:start-and-wait *toppath*))
-      (remote-conndat-set! runremote (rmt:get-connection-info *toppath*)) ;; calls client:setup which calls client:setup-http
+      (remote-conndat-set! runremote (rmt:get-connection-info *toppath* runremote)) ;; calls client:setup which calls client:setup-http
       (rmt:send-receive cmd rid params attemptnum: attemptnum)) ;; TODO: add back-off timeout as
 
      ;;DOT CASE10 [label="on homehost"];
      ;;DOT MUTEXLOCK -> CASE10 [label="server not required,\non homehost"]; {rank=same "case 10" CASE10};
      ;;DOT CASE10 -> "rmt:open-qry-close-locally";