Changelog.

Prefer deflate over gzip.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10703 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 8d994460220c416e8b954d972d7f7c2e83e9092a..3f46641592cbc15e894f40c430f043faa4f25ec8 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,13 @@
-CHANGES.txt - 1.7b1 - 2012-11-13
+CHANGES.txt - 1.7b1 - 2012-11-15
 --------------------------------
 
 CHANGES IN CUPS V1.7b1
 
+       - Added new IPP APIs for checking values (STR #4167)
+       - Added new IPP APis for adding and setting formatted strings.
        - Added new HTTP APIs to support basic server functionality via libcups.
-       - CUPS now supports compressing and decompressing streamed data.
+       - CUPS now supports compressing and decompressing streamed data
+         (STR #4168)
        - CUPS now supports higher-level PIN printing, external accounting
          systems, and "print here" printing environments (STR #4169)
        - IRIX is no longer a supported operating system (STR #4092)

diff --git a/backend/ipp.c b/backend/ipp.c
index 06a37666a3726b82f269856a7dc8464a05a99ec3..dcc60f8d1fa3180524c3f0e060a407ee460e551f 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1066,10 +1066,10 @@ main(int  argc,                         /* I - Number of command-line args */
       }
       else if (!compression)
       {
-        if (ippContainsString(compression_sup, "gzip"))
-          compression = "gzip";
-        else if (ippContainsString(compression_sup, "deflate"))
+        if (ippContainsString(compression_sup, "deflate"))
           compression = "deflate";
+        else if (ippContainsString(compression_sup, "gzip"))
+          compression = "gzip";
 
         if (compression)
           fprintf(stderr, "DEBUG: Automatically using \"%s\" compression.\n",