-CHANGES.txt - 2.0rc1 - 2014-09-02
+CHANGES.txt - 2.0rc2 - 2014-09-03
---------------------------------
---------------------------------
+CHANGES IN CUPS V2.0rc2
+
+ - The scheduler did not preserve listener sockets from launchd or
+ systemd after a restart (<rdar://problem/18112848>)
+
+
CHANGES IN CUPS V2.0rc1
- Documentation updates (STR #4464)
CHANGES IN CUPS V2.0rc1
- Documentation updates (STR #4464)
- httpAddrString(&lis->address, temp, sizeof(temp));
- cupsdLogMessage(CUPSD_LOG_WARN,
- "Duplicate listen address \"%s\" ignored.", temp);
+ if (!lis->on_demand)
+ {
+ httpAddrString(&lis->address, temp, sizeof(temp));
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "Duplicate listen address \"%s\" ignored.", temp);
+ }
+
for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
lis;
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
lis;
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+ if (!lis->on_demand)
+ {
+ cupsArrayRemove(Listeners, lis);
+ free(lis);
+ }
- cupsArrayDelete(Listeners);
- Listeners = NULL;
+ if (cupsArrayCount(Listeners) == 0)
+ {
+ cupsArrayDelete(Listeners);
+ Listeners = NULL;
+ }
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
{
#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
{
#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
- if (lis->fd != -1 && !lis->on_demand)
+ if (!lis->on_demand && lis->fd != -1)
+ {
httpAddrClose(&(lis->address), lis->fd);
httpAddrClose(&(lis->address), lis->fd);
httpAddrClose(&(lis->address), lis->fd);
httpAddrClose(&(lis->address), lis->fd);
#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */