rpms/cups/F-10 cups-str2988.patch,NONE,1.1 cups.spec,1.445,1.446

Tim Waugh twaugh at fedoraproject.org
Wed Nov 26 18:18:09 UTC 2008


Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13032

Modified Files:
	cups.spec 
Added Files:
	cups-str2988.patch 
Log Message:
* Wed Nov 26 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-10/cups.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- cups.spec	30 Oct 2008 14:31:23 -0000	1.445
+++ cups.spec	26 Nov 2008 18:17:39 -0000	1.446
@@ -49,6 +49,7 @@
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2101.patch
 Patch24: cups-str2536.patch
+Patch25: cups-str2988.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -186,6 +187,7 @@
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2101
 %patch24 -p1 -b .str2536
+%patch25 -p1 -b .str2988
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -477,6 +479,9 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed Nov 26 2008 Tim Waugh <twaugh at redhat.com>
+- Added patch to avoid polling busy loop (STR #2988).
+
 * Thu Oct 30 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-3
 - Fixed LSPP labels (bug #468442).
 




More information about the fedora-extras-commits mailing list