Merge changes from CUPS 1.4svn-r7932.

[thirdparty/cups.git] / scheduler / client.c

diff --git a/scheduler/client.c b/scheduler/client.c
index a4e249790881b47cc6fd94ba438e0c1066136161..3e3845e058094ce5b7e92966350db076a36ec320 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -524,7 +524,8 @@ cupsdCloseAllClients(void)
   for (con = (cupsd_client_t *)cupsArrayFirst(Clients);
        con;
        con = (cupsd_client_t *)cupsArrayNext(Clients))
-    cupsdCloseClient(con);
+    if (cupsdCloseClient(con))
+      cupsdCloseClient(con);
 }
 
 
@@ -1034,8 +1035,11 @@ cupsdReadClient(cupsd_client_t *con)     /* I - Client to read from */
 
        con->http.status = HTTP_OK;
 
-        cupsArrayAdd(ActiveClients, con);
-       cupsdSetBusyState();
+        if (!cupsArrayFind(ActiveClients, con))
+       {
+         cupsArrayAdd(ActiveClients, con);
+          cupsdSetBusyState();
+        }
 
     case HTTP_OPTIONS :
     case HTTP_DELETE :