Mirror fix from trunk.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11948 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index be7bce621d29538647c8441749722c090b9e0239..4865b3e0ddafb85c2c6294364f1b2d6c9412c4cf 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,7 @@ CHANGES IN CUPS V1.7.4
        - 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 b86625d0dc3cf2733b5ce0fd8fdcfaad8018d190..6f40585bc592a8a31c3dc3723aa51a2d9abf2bde 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2143,6 +2143,9 @@ cupsdReadClient(cupsd_client_t *con)      /* I - Client to read from */
            * Grab any request data from the connection...
            */
 
+           if (!httpWait(HTTP(con), 0))
+             return;
+
            if ((ipp_state = ippRead(&(con->http), con->request)) == IPP_ERROR)
            {
               cupsdLogMessage(CUPSD_LOG_ERROR,
@@ -2210,7 +2213,8 @@ cupsdReadClient(cupsd_client_t *con)      /* I - Client to read from */
          {
            if (!httpWait(HTTP(con), 0))
              return;
-            else if ((bytes = httpRead2(HTTP(con), line, sizeof(line))) < 0)
+
+            if ((bytes = httpRead2(HTTP(con), line, sizeof(line))) < 0)
            {
              if (con->http.error && con->http.error != EPIPE)
                cupsdLogMessage(CUPSD_LOG_DEBUG,