Merge changes from CUPS 1.5svn-r8916.

[thirdparty/cups.git] / cups / util.c

diff --git a/cups/util.c b/cups/util.c
index cbe49136f67c49a3163bc76e9c6918c046a1008e..87ba2c0ce508e03eaa0ba12d7e7e7ec7d96e978a 100644 (file)
--- a/cups/util.c
+++ b/cups/util.c
@@ -1511,12 +1511,36 @@ cupsPrintFiles2(
       return (0);
     }
 
-    status = cupsStartDocument(http, name, job_id, docname, format,
-                               i == (num_files - 1));
+    do
+    {
+      cupsFileRewind(fp);
+
+      status = cupsStartDocument(http, name, job_id, docname, format,
+                                i == (num_files - 1));
 
-    while (status == HTTP_CONTINUE &&
-           (bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
-      status = cupsWriteRequestData(http, buffer, bytes);
+      while (status == HTTP_CONTINUE &&
+            (bytes = cupsFileRead(fp, buffer, sizeof(buffer))) > 0)
+        status = cupsWriteRequestData(http, buffer, bytes);
+
+      if (status == HTTP_UNAUTHORIZED)
+      {
+        char   resource[1024];         /* Printer resource */
+
+        snprintf(resource, sizeof(resource), "/printers/%s", name);
+
+        if (!cupsDoAuthentication(http, "POST", resource))
+        {
+         if (httpReconnect(http))
+         {
+           _cupsSetError(IPP_SERVICE_UNAVAILABLE, NULL, 0);
+           return (0);
+         }
+        }
+       else
+         status = HTTP_AUTHORIZATION_CANCELED;
+      }
+    }
+    while (status == HTTP_UNAUTHORIZED);
 
     cupsFileClose(fp);