rpms/cups/FC-6 cups-busy-loop.patch,NONE,1.1 cups.spec,1.315,1.316

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv19498

Modified Files:
	cups.spec 
Added Files:
	cups-busy-loop.patch 
Log Message:
* Wed Jan 24 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.7-1.8
- Try another fix for bug #219330 (STR #2179).
- Resolves: rhbz#219330


cups-busy-loop.patch:
 ipp.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE cups-busy-loop.patch ---
--- cups-1.2.7/cups/ipp.c.busy-loop	2007-01-24 13:45:50.000000000 +0000
+++ cups-1.2.7/cups/ipp.c	2007-01-24 13:47:24.000000000 +0000
@@ -1098,8 +1098,11 @@
 	  break;
 
     case IPP_ATTRIBUTE :
-        while ((*cb)(src, buffer, 1) > 0)
+        for (;;)
 	{
+	  if ((*cb)(src, buffer, 1) < 1)
+	    return (IPP_ERROR);
+
 	  DEBUG_printf(("ippReadIO: ipp->current=%p, ipp->prev=%p\n",
 	                ipp->current, ipp->prev));
 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- cups.spec	12 Jan 2007 16:27:21 -0000	1.315
+++ cups.spec	24 Jan 2007 13:48:30 -0000	1.316
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.7
-Release: 1.7%{?dist}
+Release: 1.8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -49,6 +49,7 @@
 Patch23: cups-str2111.patch
 Patch24: cups-str2133.patch
 Patch25: cups-str2179.patch
+Patch26: cups-busy-loop.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -159,6 +160,7 @@
 %patch23 -p1 -b .str2111
 %patch24 -p1 -b .str2133
 %patch25 -p1 -b .str2179
+%patch26 -p1 -b .busy-loop
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -441,6 +443,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Jan 24 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.7-1.8
+- Try another fix for bug #219330 (STR #2179).
+
 * Fri Jan 12 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.7-1.7
 - Don't even reload CUPS when rotating logs (bug #215024).