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

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10868 - in trunk: . scheduler
From:       cups-dev () easysw ! com
Date:       2013-02-19 23:51:35
Message-ID: 11638-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2013-02-19 15:51:34 -0800 (Tue, 19 Feb 2013)
New Revision: 10868
Log:
The scheduler did not support long MIME media types (STR #4270)



Modified:
   trunk/CHANGES-1.6.txt
   trunk/scheduler/ipp.c
   trunk/scheduler/testmime.c

Modified: trunk/CHANGES-1.6.txt
===================================================================
--- trunk/CHANGES-1.6.txt	2013-02-19 23:45:08 UTC (rev 10867)
+++ trunk/CHANGES-1.6.txt	2013-02-19 23:51:34 UTC (rev 10868)
@@ -12,6 +12,7 @@
 	- Added a French localization (STR #4247)
 	- Added a Russian localization (STR #4228)
 	- Updated the Catalan localization (STR #4202)
+	- The scheduler did not support long MIME media types (STR #4270)
 	- The cupsfilter command did not set the CHARSET environment variable
 	  for the text filters (STR #4273)
 	- The lp command did not show errors for unknown "--foo" (STR #4261)

Modified: trunk/scheduler/ipp.c
===================================================================
--- trunk/scheduler/ipp.c	2013-02-19 23:45:08 UTC (rev 10867)
+++ trunk/scheduler/ipp.c	2013-02-19 23:51:34 UTC (rev 10868)
@@ -8074,7 +8074,7 @@
     * Grab format from client...
     */
 
-    if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]", super,
+    if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]", super,
                type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
@@ -8091,7 +8091,7 @@
     * Use default document format...
     */
 
-    if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2)
+    if (sscanf(default_format, "%15[^/]/%255[^;]", super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
                       _("Bad document-format \"%s\"."),
@@ -9306,7 +9306,7 @@
     * Grab format from client...
     */
 
-    if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]",
+    if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]",
                super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST, _("Bad document-format \"%s\"."),
@@ -9322,7 +9322,7 @@
     * Use default document format...
     */
 
-    if (sscanf(default_format, "%15[^/]/%31[^;]", super, type) != 2)
+    if (sscanf(default_format, "%15[^/]/%255[^;]", super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,
                       _("Bad document-format-default \"%s\"."), default_format);
@@ -10822,7 +10822,7 @@
   if ((format = ippFindAttribute(con->request, "document-format",
                                  IPP_TAG_MIMETYPE)) != NULL)
   {
-    if (sscanf(format->values[0].string.text, "%15[^/]/%31[^;]",
+    if (sscanf(format->values[0].string.text, "%15[^/]/%255[^;]",
                super, type) != 2)
     {
       send_ipp_status(con, IPP_BAD_REQUEST,

Modified: trunk/scheduler/testmime.c
===================================================================
--- trunk/scheduler/testmime.c	2013-02-19 23:45:08 UTC (rev 10867)
+++ trunk/scheduler/testmime.c	2013-02-19 23:51:34 UTC (rev 10868)
@@ -3,7 +3,7 @@
  *
  *   MIME test program for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -132,7 +132,7 @@
     }
     else
     {
-      sscanf(argv[i], "%15[^/]/%31s", super, type);
+      sscanf(argv[i], "%15[^/]/%255s", super, type);
       dst = mimeType(mime, super, type);
 
       filters = mimeFilter2(mime, src, srcinfo.st_size, dst, &cost);

_______________________________________________
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]