- Don't treat SIGPIPE as an error (bug #569770).
This commit is contained in:
parent
d9fac81292
commit
f74bd4b1d9
@ -22,3 +22,27 @@ diff -up cups-1.4.2/scheduler/process.c.str3399 cups-1.4.2/scheduler/process.c
|
|||||||
#endif /* HAVE_SIGSET */
|
#endif /* HAVE_SIGSET */
|
||||||
|
|
||||||
cupsdReleaseSignals();
|
cupsdReleaseSignals();
|
||||||
|
--- cups-1.4.2/scheduler/main.c.str3399 2010-03-02 11:04:28.968100478 +0000
|
||||||
|
+++ cups-1.4.2/scheduler/main.c 2010-03-02 11:04:47.442226409 +0000
|
||||||
|
@@ -1733,7 +1733,7 @@ process_children(void)
|
||||||
|
job->backend = -pid;
|
||||||
|
|
||||||
|
if (status && status != SIGTERM && status != SIGKILL &&
|
||||||
|
- job->status >= 0)
|
||||||
|
+ status != SIGPIPE && job->status >= 0)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* An error occurred; save the exit status so we know to stop
|
||||||
|
@@ -1829,6 +1829,12 @@ process_children(void)
|
||||||
|
"PID %d (%s) was terminated normally with signal %d.",
|
||||||
|
pid, name, status);
|
||||||
|
}
|
||||||
|
+ else if (status == SIGPIPE)
|
||||||
|
+ {
|
||||||
|
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
|
||||||
|
+ "PID %d (%s) did not catch or ignore signal %d.",
|
||||||
|
+ pid, name, status);
|
||||||
|
+ }
|
||||||
|
else if (status)
|
||||||
|
{
|
||||||
|
if (WIFEXITED(status))
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
Summary: Common Unix Printing System
|
Summary: Common Unix Printing System
|
||||||
Name: cups
|
Name: cups
|
||||||
Version: 1.4.2
|
Version: 1.4.2
|
||||||
Release: 32%{?dist}
|
Release: 33%{?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
|
||||||
@ -556,6 +556,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{php_extdir}/phpcups.so
|
%{php_extdir}/phpcups.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 2 2010 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-33
|
||||||
|
- Don't treat SIGPIPE as an error (bug #569770).
|
||||||
|
|
||||||
* Wed Feb 24 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-32
|
* Wed Feb 24 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-32
|
||||||
- Fixed cupsGetNamedDest() so it falls back to the real default
|
- Fixed cupsGetNamedDest() so it falls back to the real default
|
||||||
printer when a default from configuration file does not exist (bug #565569, STR #3503).
|
printer when a default from configuration file does not exist (bug #565569, STR #3503).
|
||||||
|
Loading…
Reference in New Issue
Block a user