Don't call launch_activate_socket multiple times (<rdar://problem/17523218>)

Bump version to 2.0rc1.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12080 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index eb812c4d7fa8e51c9c9688640577266de4664286..5acbd89a574d3562b3c02dbfa921345b88d733b9 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,11 @@
-CHANGES.txt - 2.0b1 - 2014-07-30
---------------------------------
+CHANGES.txt - 2.0rc1 - 2014-08-04
+---------------------------------
+
+CHANGES IN CUPS V2.0rc1
+
+       - The scheduler incorrectly called launch_activate_socket multiple times
+         on OS X (<rdar://problem/17523218>)
+
 
 CHANGES IN CUPS V2.0b1
 

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 181fd587204a1cc045f9d12168c941cb0f7bf21e..c01523b979197160a48dbaa31303c06750940ea3 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="2.0b1"
+CUPS_VERSION="2.0rc1"
 CUPS_REVISION=""
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #      CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"

diff --git a/scheduler/listen.c b/scheduler/listen.c
index 6fe34c90eb62913c1b5301866d4dbf1a4c734325..b23c5e27bf6172b9702b4e53be0321672d9f5f83 100644 (file)
--- a/scheduler/listen.c
+++ b/scheduler/listen.c
@@ -274,23 +274,14 @@ cupsdStopListening(void)
        lis;
        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
   {
-#ifdef HAVE_SYSTEMD
+#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
     if (lis->fd != -1 && !lis->on_demand)
       httpAddrClose(&(lis->address), lis->fd);
 
-#elif defined(HAVE_LAUNCHD)
-    if (lis->fd != -1)
-    {
-      if (lis->on_demand)
-        httpAddrClose(NULL, lis->fd);
-      else
-        httpAddrClose(&(lis->address), lis->fd);
-    }
-
 #else
     if (lis->fd != -1)
       httpAddrClose(&(lis->address), lis->fd);
-#endif /* HAVE_SYSTEMD */
+#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
 
     lis->fd = -1;
   }

diff --git a/scheduler/main.c b/scheduler/main.c
index 132cc6060a93214245f81820fba4222b65e6b452..1b2e7d73b4e97eba1e3eef4072ab5c448d06ba46 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -726,19 +726,6 @@ main(int  argc,                            /* I - Number of command-line args */
           break;
        }
 
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
-       if (OnDemand)
-       {
-        /*
-         * If we were started by launchd or systemd, get the listen socket file
-         * descriptors...
-         */
-
-         service_checkin();
-         service_checkout();
-       }
-#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
-
        /*
         * Startup the server...
         */