From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 24 Jun 2014 18:43:27 +0000 (+0000)
Subject: Mirror fix from trunk.
X-Git-Tag: release-2.1.4~16^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d15d70899b735b481ae1ba838f5b3bc122650ba6;p=thirdparty%2Fcups.git

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 be7bce621d..4865b3e0dd 100644
--- 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 b86625d0dc..6f40585bc5 100644
--- 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,