Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at 2015-04-07 09:26:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups (Old) and /work/SRC/openSUSE:Factory/.cups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups" Changes: -------- --- /work/SRC/openSUSE:Factory/cups/cups.changes 2015-02-20 13:50:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cups.new/cups.changes 2015-04-07 09:26:45.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Mar 28 13:03:28 UTC 2015 - [email protected] + +- Add patch cups-busy-loop.patch to fix rh#1179596 , cups#4605 + +------------------------------------------------------------------- New: ---- cups-busy-loop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.5PEmpX/_old 2015-04-07 09:26:46.000000000 +0200 +++ /var/tmp/diff_new_pack.5PEmpX/_new 2015-04-07 09:26:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cups # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,6 +43,8 @@ Patch11: cups-1.4.3-default-webcontent-path.patch # Patch12 cups-systemd-socket.patch Use systemd socket activation properly Patch12: cups-systemd-socket.patch +# Patch13 cups-busy-loop.patch fixes rh#1179596 cups#4605 +Patch13: cups-busy-loop.patch # Patch100...Patch999 is for private patches from SUSE which are not intended for upstream: # Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE: Patch100: cups-pam.diff @@ -251,6 +253,7 @@ # and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments: %patch11 %patch12 -p1 +%patch13 -p1 # Patch100...Patch999 is for private patches from SUSE which are not intended for upstream: # Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE: %patch100 ++++++ cups-busy-loop.patch ++++++ diff -up cups-2.0.2/scheduler/client.c.busy-loop cups-2.0.2/scheduler/client.c --- cups-2.0.2/scheduler/client.c.busy-loop 2014-08-28 16:37:22.000000000 +0100 +++ cups-2.0.2/scheduler/client.c 2015-03-16 17:24:32.506232983 +0000 @@ -585,6 +585,17 @@ cupsdReadClient(cupsd_client_t *con) /* * connection and we need to shut it down... */ + if (!httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1) + { + /* + * Connection closed... + */ + + cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF."); + cupsdCloseClient(con); + return; + } + cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on unexpected HTTP read state %s.", httpStateString(httpGetState(con->http))); cupsdCloseClient(con); @@ -1979,12 +1990,6 @@ cupsdReadClient(cupsd_client_t *con) /* if (httpGetState(con->http) == HTTP_STATE_POST_SEND) { - /* - * Don't listen for activity until we decide to do something with this... - */ - - cupsdAddSelect(httpGetFd(con->http), NULL, NULL, con); - if (con->file >= 0) { fstat(con->file, &filestats);
