From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Mon, 4 Apr 2016 19:13:08 +0000 (-0400)
Subject: Do not compress print jobs by default except for certain raster formats.
X-Git-Tag: v2.2b1~72
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=515c3db932b8f74daf0b3c167aa1b988212255e3

Do not compress print jobs by default except for certain raster formats.
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 170080294..75eaaee68 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,11 @@
-CHANGES.txt - 2.2b1 - 2016-03-30
+CHANGES.txt - 2.2b1 - 2016-04-04
 --------------------------------
 
 CHANGES IN CUPS V2.2b1
 
+	- The IPP backend no longer enables compression by default except for
+	  certain raster formats that generally benefit from it
+	  (<rdar://problem/25166952>)
 	- The scheduler did not handle out-of-disk situations gracefully
 	  (Issue #4742)
 	- The LPD mini-daemon now detects invalid UTF-8 sequences in job,
diff --git a/backend/ipp.c b/backend/ipp.c
index 69aa69453..943fddae6 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1096,7 +1096,7 @@ main(int  argc,				/* I - Number of command-line args */
                         "compression value \"%s\".\n", compression);
         compression = NULL;
       }
-      else if (!compression)
+      else if (!compression && (!strcmp(final_content_type, "image/pwg-raster") || !strcmp(final_content_type, "image/urf")))
       {
         if (ippContainsString(compression_sup, "gzip"))
           compression = "gzip";
@@ -1357,24 +1357,10 @@ main(int  argc,				/* I - Number of command-line args */
 
   if (format_sup != NULL)
   {
-    for (i = 0; i < format_sup->num_values; i ++)
-      if (!_cups_strcasecmp(final_content_type,
-                            format_sup->values[i].string.text))
-      {
-        document_format = final_content_type;
-	break;
-      }
-
-    if (!document_format)
-    {
-      for (i = 0; i < format_sup->num_values; i ++)
-	if (!_cups_strcasecmp("application/octet-stream",
-	                      format_sup->values[i].string.text))
-	{
-	  document_format = "application/octet-stream";
-	  break;
-	}
-    }
+    if (ippContainsString(format_sup, final_content_type))
+      document_format = final_content_type;
+    else if (ippContainsString(format_sup, "application/octet-stream"))
+      document_format = "application/octet-stream";
   }
 
   fprintf(stderr, "DEBUG: final_content_type=\"%s\", document_format=\"%s\"\n",
diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html
index 775e7e9bc..473ab2bff 100644
--- a/doc/help/man-lpadmin.html
+++ b/doc/help/man-lpadmin.html
@@ -136,6 +136,7 @@ If the resulting class becomes empty it is removed.
 <dd style="margin-left: 5.0em">Sets user-level access control on a destination.
 Names starting with "@" are interpreted as UNIX groups.
 The latter two forms turn user-level access control off.
+Note: The user 'root' is not granted special access - using "-u allow:foo,bar" will allow users 'foo' and 'bar' to access the printer but NOT 'root'.
 <dt><b>-v "</b><i>device-uri</i><b>"</b>
 <dd style="margin-left: 5.0em">Sets the <i>device-uri</i> attribute of the printer queue.
 Use the <i>-v</i> option with the
@@ -173,7 +174,7 @@ Create an IPP Everywhere print queue:
 <a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2015 by Apple Inc.
+Copyright &copy; 2007-2016 by Apple Inc.
 
 </body>
 </html>