rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Avoid busy loop in cups-polld (bug #720921).

Browse Source
This commit is contained in:
Tim Waugh 2011-07-13 10:23:55 +01:00
parent 10829b97af
commit a8d53773cf
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cups-polld-busy-loop.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up cups-1.4.7/cups/request.c.polld-busy-loop cups-1.4.7/cups/request.c
--- cups-1.4.7/cups/request.c.polld-busy-loop 2011-03-04 19:28:38.000000000 +0000
+++ cups-1.4.7/cups/request.c 2011-07-13 10:21:25.397211968 +0100
@@ -395,7 +395,7 @@ cupsGetResponse(http_t *http, /* I -
{
status = httpUpdate(http);
}
- while (http->state == HTTP_POST_RECV);
+ while (status != HTTP_ERROR && http->state == HTTP_POST_RECV);
DEBUG_printf(("2cupsGetResponse: status=%d", status));

8
cups.spec
View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.7 Version: 1.4.7
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -65,6 +65,7 @@ Patch31: cups-dnssd-deviceid.patch
Patch32: cups-ricoh-deviceid-oid.patch Patch32: cups-ricoh-deviceid-oid.patch
Patch33: cups-texttops-rotate-page.patch Patch33: cups-texttops-rotate-page.patch
Patch34: cups-str3875.patch Patch34: cups-str3875.patch
Patch35: cups-polld-busy-loop.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -265,6 +266,8 @@ module.
%patch33 -p1 -b .texttops-rotate-page %patch33 -p1 -b .texttops-rotate-page
# Fix SNMP supply level crasher (STR #3875, bug #719057). # Fix SNMP supply level crasher (STR #3875, bug #719057).
%patch34 -p1 -b .str3875 %patch34 -p1 -b .str3875
# Avoid busy loop in cups-polld (bug #720921).
%patch35 -p1 -b .polld-busy-loop
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -568,6 +571,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Wed Jul 13 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.7-6
- Avoid busy loop in cups-polld (bug #720921).
* Thu Jul 7 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.7-5 * Thu Jul 7 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.4.7-5
- Fix SNMP supply level crasher (STR #3875, bug #719057). - Fix SNMP supply level crasher (STR #3875, bug #719057).