[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r9100 - in trunk: . scheduler
From:       cups-dev () easysw ! com
Date:       2010-04-12 0:37:35
Message-ID: 9870-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2010-04-11 17:37:34 -0700 (Sun, 11 Apr 2010)
New Revision: 9100
Log:
Fixed an IPP conformance issue with the scheduler's Send-Document implementation
(STR #3514)



Modified:
   trunk/CHANGES-1.4.txt
   trunk/scheduler/ipp.c

Modified: trunk/CHANGES-1.4.txt
===================================================================
--- trunk/CHANGES-1.4.txt	2010-04-11 07:16:05 UTC (rev 9099)
+++ trunk/CHANGES-1.4.txt	2010-04-12 00:37:34 UTC (rev 9100)
@@ -1,6 +1,12 @@
 CHANGES-1.4.txt
 ---------------
 
+CHANGES IN CUPS V1.4.5
+
+	- Fixed an IPP conformance issue with the scheduler's Send-Document
+	  implementation (STR #3514)
+
+
 CHANGES IN CUPS V1.4.4
 
 	- Documentation updates (STR #3453, STR #3527, STR #3528, STR #3529)

Modified: trunk/scheduler/ipp.c
===================================================================
--- trunk/scheduler/ipp.c	2010-04-11 07:16:05 UTC (rev 9099)
+++ trunk/scheduler/ipp.c	2010-04-12 00:37:34 UTC (rev 9100)
@@ -10223,6 +10223,17 @@
 
   if (!con->filename)
   {
+   /*
+    * Check for an empty request with "last-document" set to true, which is
+    * used to close an "open" job by RFC 2911, section 3.3.2.
+    */
+
+    if (job->num_files > 0 &&
+        (attr = ippFindAttribute(con->request, "last-document",
+	                         IPP_TAG_BOOLEAN)) != NULL &&
+        attr->values[0].boolean)
+      goto last_document;
+
     send_ipp_status(con, IPP_BAD_REQUEST, _("No file!?"));
     return;
   }
@@ -10379,6 +10390,8 @@
   * Start the job if this is the last document...
   */
 
+  last_document:
+
   if ((attr = ippFindAttribute(con->request, "last-document",
                                IPP_TAG_BOOLEAN)) != NULL &&
       attr->values[0].boolean)

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]