Fix IPP read error messages (STR #4440)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11947 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 46172fe23de58cd43e363df690884ee9b3b6fc95..0fb25d7bdccb553064ad9f22eb04abe4ae7d13d6 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -11,6 +11,9 @@ CHANGES IN CUPS V1.7.4
        - The web interface now properly shows a "Go" button for all text-based
          browsers (STR #4425)
        - The MaxJobTime directive now properly supports time values (STR #4434)
+       - The RPM spec file did not work due to the new Brazilian Portuguese
+         localization (STR #4436)
+       - Fixed an "IPP read error" issue (STR #4440)
 
 
 CHANGES IN CUPS V1.7.3

diff --git a/scheduler/client.c b/scheduler/client.c
index 3bf845c3508b702be3c3c60c63a1395cf2b55518..edb3e9deb4b631f8700b42440e29bae6eb4fd1c0 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1859,6 +1859,9 @@ cupsdReadClient(cupsd_client_t *con)      /* I - Client to read from */
            * Grab any request data from the connection...
            */
 
+           if (!httpWait(con->http, 0))
+             return;
+
            if ((ipp_state = ippRead(con->http, con->request)) == IPP_STATE_ERROR)
            {
               cupsdLogClient(con, CUPSD_LOG_ERROR, "IPP read error: %s",