From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 24 Jun 2014 18:43:20 +0000 (+0000)
Subject: Fix IPP read error messages (STR #4440)
X-Git-Tag: v2.2b1~596
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=175bc7986c159c304ee099016b4cf3158720caa3;p=thirdparty%2Fcups.git

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 46172fe23d..0fb25d7bdc 100644
--- 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 3bf845c350..edb3e9deb4 100644
--- 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",