cupsDoIORequest could miss the server status, causing failed lpadmin and other admini...

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 c8e3da042eff56956ba152d810a8999c3fe928f0..b6e6e67af48ae90cb05af5db879d3bcdcbf592f4 100644 (file)
--- 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 2f909f392245f36f856127882bc2e2fe052d165e..f4e7e8892b56e49c11b827606f2f31e3452a8886 100644 (file)
--- 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);