diff --git a/cups-str2988.patch b/cups-str2988.patch new file mode 100644 index 0000000..16123dd --- /dev/null +++ b/cups-str2988.patch @@ -0,0 +1,19 @@ +diff -up cups-1.3.9/scheduler/client.c.str2988 cups-1.3.9/scheduler/client.c +--- cups-1.3.9/scheduler/client.c.str2988 2008-09-17 01:42:56.000000000 +0100 ++++ cups-1.3.9/scheduler/client.c 2008-11-13 10:09:05.000000000 +0000 +@@ -1011,6 +1011,15 @@ cupsdReadClient(cupsd_client_t *con) /* + break; + + default : ++ if (!data_ready(con) && recv(con->http.fd, buf, 1, MSG_PEEK) < 1) ++ { ++ /* ++ * Connection closed... ++ */ ++ ++ cupsdCloseClient(con); ++ return; ++ } + break; /* Anti-compiler-warning-code */ + } + diff --git a/cups.spec b/cups.spec index 7669e4c..afdc417 100644 --- a/cups.spec +++ b/cups.spec @@ -48,6 +48,7 @@ Patch20: cups-logrotate.patch Patch21: cups-usb-paperout.patch Patch22: cups-getnameddest.patch Patch23: cups-str2536.patch +Patch24: cups-str2988.patch Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -169,6 +170,7 @@ lpd emulation. %patch21 -p1 -b .usb-paperout %patch22 -p1 -b .getnameddest %patch23 -p1 -b .str2536 +%patch24 -p1 -b .str2988 %if %lspp %patch100 -p1 -b .lspp @@ -451,6 +453,9 @@ rm -rf $RPM_BUILD_ROOT %{cups_serverbin}/daemon/cups-lpd %changelog +* Thu Nov 13 2008 Tim Waugh +- Added patch to avoid polling busy loop (STR #2988). + * Tue Oct 21 2008 Tim Waugh - Fixed textonly filter to send FF correctly.