rpms/cups/F-9 cups-str2988.patch,NONE,1.1 cups.spec,1.426,1.427
Tim Waugh
twaugh at fedoraproject.org
Thu Nov 13 10:16:48 UTC 2008
- Previous message: rpms/kernel/F-10 drm-intel-8xx-pae-no-gem.patch,1.2,1.3
- Next message: rpms/memtester/EL-5 memtester-4.0.8-debuginfo.patch, NONE, 1.1 memtester.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11714
Modified Files:
cups.spec
Added Files:
cups-str2988.patch
Log Message:
* Thu Nov 13 2008 Tim Waugh <twaugh at redhat.com>
- Added patch to avoid polling busy loop (STR #2988).
cups-str2988.patch:
--- NEW FILE cups-str2988.patch ---
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 */
}
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -r1.426 -r1.427
--- cups.spec 21 Oct 2008 10:24:06 -0000 1.426
+++ cups.spec 13 Nov 2008 10:16:17 -0000 1.427
@@ -48,6 +48,7 @@
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 @@
%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 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Thu Nov 13 2008 Tim Waugh <twaugh at redhat.com>
+- Added patch to avoid polling busy loop (STR #2988).
+
* Tue Oct 21 2008 Tim Waugh <twaugh at redhat.com>
- Fixed textonly filter to send FF correctly.
- Previous message: rpms/kernel/F-10 drm-intel-8xx-pae-no-gem.patch,1.2,1.3
- Next message: rpms/memtester/EL-5 memtester-4.0.8-debuginfo.patch, NONE, 1.1 memtester.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list