From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 5 Mar 2014 18:51:44 +0000 (+0000)
Subject: cupsDoIORequest could miss the server status, causing failed lpadmin and other admini... 
X-Git-Tag: v2.2b1~718
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa17c11e8a101fd0e2806c3e01b0f3e1c884b271;p=thirdparty%2Fcups.git

cupsDoIORequest could miss the server status, causing failed lpadmin and other administrative commands (STR #4386)

Look for 100-continue or lower, and get the final status code if so.


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

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index c8e3da042e..b6e6e67af4 100644
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -6,7 +6,10 @@ CHANGES IN CUPS V1.7.2
 	- Security: The scheduler now blocks URLs containing embedded HTML
 	  (STR #4356)
 	- Documentation fixes (STR #3259, STR #4346)
+	- Fixed the Japanese localization (STR #4385)
 	- Added a German localization (STR #4363)
+	- cupsDoIORequest could miss the server status, causing failed lpadmin
+	  and other administrative commands (STR #4386)
 	- cupsEnumDests didn't always call the callback function (STR #4380)
 	- "lp -i job-id -H hold" did not work (STR #nnn)
 	- CUPS didn't compile on older platforms (STR #4338)
diff --git a/cups/request.c b/cups/request.c
index 2f909f3922..f4e7e8892b 100644
--- a/cups/request.c
+++ b/cups/request.c
@@ -245,7 +245,7 @@ cupsDoIORequest(http_t     *http,	/* I - Connection to server or @code CUPS_HTTP
     * Get the server's response...
     */
 
-    if (status != HTTP_STATUS_ERROR)
+    if (status <= HTTP_STATUS_CONTINUE)
     {
       response = cupsGetResponse(http, resource);
       status   = httpGetStatus(http);