From: Michael R Sweet Date: Tue, 14 Mar 2017 13:01:18 +0000 (-0400) Subject: Fix an issue with the error handling for the network backends (Issue #4979) X-Git-Tag: v2.2.3~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b1399a2c19392b40e1eaf8049440071f2fdf642;p=thirdparty%2Fcups.git Fix an issue with the error handling for the network backends (Issue #4979) --- diff --git a/CHANGES.txt b/CHANGES.txt index e8ccbed773..17985581c5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 2.2.3 - 2017-03-10 +CHANGES.txt - 2.2.3 - 2017-03-14 -------------------------------- CHANGES IN CUPS V2.2.3 @@ -19,6 +19,7 @@ CHANGES IN CUPS V2.2.3 (Issue #4954) - The IPP Everywhere finishings support did not work correctly with common UI or command-line options (Issue #4976) + - Fixed an error handling issue for the network backends (Issue #4979) - The default cupsd.conf file did not work on systems compiled without Kerberos support (Issue #4947) - Fixed some localization issues on macOS () diff --git a/backend/runloop.c b/backend/runloop.c index baa3462731..13e5225261 100644 --- a/backend/runloop.c +++ b/backend/runloop.c @@ -77,7 +77,7 @@ backendDrainOutput(int print_fd, /* I - Print file descriptor */ * Read error - bail if we don't see EAGAIN or EINTR... */ - if (errno != EAGAIN || errno != EINTR) + if (errno != EAGAIN && errno != EINTR) { fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno)); _cupsLangPrintFilter(stderr, "ERROR", _("Unable to read print data.")); @@ -305,7 +305,7 @@ backendRunLoop( * Read error - bail if we don't see EAGAIN or EINTR... */ - if (errno != EAGAIN || errno != EINTR) + if (errno != EAGAIN && errno != EINTR) { fprintf(stderr, "DEBUG: Read failed: %s\n", strerror(errno)); _cupsLangPrintFilter(stderr, "ERROR",