Printing using "ipps" URIs was not encrypted.

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

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index e5d08e7fea56d3955ccb702416a64a1c36575f58..7a409a845200f30d5834fc7f0f3ca9191f056801 100644 (file)
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -5,6 +5,7 @@ CHANGES IN CUPS V1.6.3
 
        - The configure script now prefers Clang over GCC.
        - Fixed a compile problem on AIX (STR #4307)
+       - Printing using "ipps" URIs was not encrypted.
        - Insecure ICC profiles prevented installation of user profiles for a
          printer on OS X.
        - Added more USB quirks for the libusb-based backend (STR #4311)

diff --git a/backend/ipp.c b/backend/ipp.c
index 79f06c54d0ef40ccd421292ca30f33ccb784a398..e7f3c3f3e70d73ef5cef9abff3b76799a9e2eda9 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -431,7 +431,7 @@ main(int  argc,                             /* I - Number of command-line args */
   if (!port)
     port = IPP_PORT;                   /* Default to port 631 */
 
-  if (!strcmp(scheme, "https"))
+  if (!strcmp(scheme, "https") || !strcmp(scheme, "ipps"))
     cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
   else
     cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);