The scheduler could pause responding to client requests in order to save state

changes to disk (<rdar://problem/28690656>)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5630ee88d7f19bd3960b23d76ab01b45ea293863..7cbf24a5aad59dee3bf76b320c5ed9f5210825f2 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,12 @@
-CHANGES.txt - 2.2.3 - 2017-01-26
+CHANGES.txt - 2.2.3 - 2017-03-08
 --------------------------------
 
 CHANGES IN CUPS V2.2.3
 
        - The IPP backend could get into an infinite loop for certain errors,
          causing a hung queue (<rdar://problem/28008717>)
+       - The scheduler could pause responding to client requests in order to
+         save state changes to disk (<rdar://problem/28690656>)
        - Fixed some localization issues on macOS.
 
 

diff --git a/scheduler/main.c b/scheduler/main.c
index e18ffb0c68106cba7df060f9b549447bd8f49973..bdb27a6db622cfa0f2fa5a1d3a0082aa703f337d 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1,7 +1,7 @@
 /*
  * Main loop for the CUPS scheduler.
  *
- * Copyright 2007-2016 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -889,7 +889,7 @@ main(int  argc,                             /* I - Number of command-line args */
     * Write dirty config/state files...
     */
 
-    if (DirtyCleanTime && current_time >= DirtyCleanTime)
+    if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0)
       cupsdCleanDirty();
 
 #ifdef __APPLE__