Exit with keep-alive instead of doing a in-place restart when on-demand

launching is in use (Issue #4760)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3fe44e5f637d9f5a7e916fcc0edbe9a557be549b..e3126c017ebb47813b0286a5f9e14dd23cab5b3d 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,10 @@
-CHANGES.txt - 2.2b1 - 2016-05-25
+CHANGES.txt - 2.2b1 - 2016-05-31
 --------------------------------
 
 CHANGES IN CUPS V2.2b1
 
        - All CUPS commands now support POSIX options (Issue #4813)
+       - The scheduler now restarts faster (Issue #4760)
        - Improved performance of web interface with large numbers of jobs
          (Issue #3819)
        - Encrypted printing can now be limited to only trusted printers and

diff --git a/scheduler/main.c b/scheduler/main.c
index f9b46bad6ed6f103e2b1c7ae75906b66a6cfdb8b..cb311beb73dedb424b5a9c65e331ec9c43b40dc0 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -754,6 +754,11 @@ main(int  argc,                            /* I - Number of command-line args */
        * Shutdown the server...
        */
 
+#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+       if (OnDemand)
+         break;
+#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+
         DoingShutdown = 1;
 
        cupsdStopServer();
@@ -2159,6 +2164,7 @@ service_checkout(void)
 
   if (cupsArrayCount(ActiveJobs) ||    /* Active jobs */
       WebInterface ||                  /* Web interface enabled */
+      NeedReload ||                    /* Doing a reload */
       (Browsing && BrowseLocalProtocols && cupsArrayCount(Printers)))
                                        /* Printers being shared */
   {