Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@4199 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index d78a9f4782db1703862e24ab2fc162a42591c38e..c0e126475f73a35bfc0422b408b3c4d83eb08ca4 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,12 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.21rc2
 
+       - The scheduler did not pass the correct CUPS_ENCRYPTION
+         setting to CGI programs which caused problems on
+         systems which used non-standard encryption settings
+         (STR #773)
+       - The lpq command showed 11st, 12nd, and 13rd instead of
+         11th, 12th, and 13th for the rank (STR #769)
        - "make install" didn't work on some platforms due to an
          error in the man page makefiles (STR #775)
        - Changed some calls to snprintf() in the scheduler to

diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index 55725c7a565c4e6a44bd97cb0aaad0a9bcc2a208..466f617d34aad962103d9cca82fcf0ff8d147b6f 100644 (file)
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpq.c,v 1.17.2.13 2004/05/27 15:37:47 mike Exp $"
+ * "$Id: lpq.c,v 1.17.2.14 2004/06/17 14:45:12 mike Exp $"
  *
  *   "lpq" command for the Common UNIX Printing System (CUPS).
  *
@@ -438,7 +438,16 @@ show_jobs(http_t     *http,        /* I - HTTP connection to server */
        strcpy(rankstr, "active");
       else
       {
-       snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
+       /*
+        * Make the rank show the "correct" suffix for each number
+       * (11-13 are the only special cases, for English anyways...)
+       */
+
+       if ((rank % 100) >= 11 && (rank % 100) <= 13)
+         snprintf(rankstr, sizeof(rankstr), "%dth", rank);
+       else
+         snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
+
        rank ++;
       }
 
@@ -582,5 +591,5 @@ usage(void)
 
 
 /*
- * End of "$Id: lpq.c,v 1.17.2.13 2004/05/27 15:37:47 mike Exp $".
+ * End of "$Id: lpq.c,v 1.17.2.14 2004/06/17 14:45:12 mike Exp $".
  */

diff --git a/scheduler/client.c b/scheduler/client.c
index 423eed318adb3441cc35731063be7f7384222e20..e698574d604f9fad0ce6202b75a199b0e0205921 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c,v 1.91.2.81 2004/04/20 13:40:30 mike Exp $"
+ * "$Id: client.c,v 1.91.2.82 2004/06/17 14:45:12 mike Exp $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -2974,6 +2974,13 @@ pipe_command(client_t *con,              /* I - Client connection */
 
                  "EUC-CN",     "EUC-JP",       "EUC-KR",       "EUC-TW"
                };
+  static const char * const encryptions[] =
+               {
+                 "CUPS_ENCRYPTION=IfRequested",
+                 "CUPS_ENCRYPTION=Never",
+                 "CUPS_ENCRYPTION=Required",
+                 "CUPS_ENCRYPTION=Always"
+               };
 
 
  /*
@@ -3186,10 +3193,13 @@ pipe_command(client_t *con,             /* I - Client connection */
   */
 
   if (con->http.encryption == HTTP_ENCRYPT_ALWAYS)
-  {
     envp[envc ++] = "HTTPS=ON";
-    envp[envc ++] = "CUPS_ENCRYPTION=Always";
-  }
+
+  envp[envc ++] = (char *)encryptions[LocalEncryption];
+
+ /*
+  * Terminate the environment array...
+  */
 
   envp[envc] = NULL;
 
@@ -3395,5 +3405,5 @@ CDSAWriteFunc(SSLConnectionRef connection,        /* I  - SSL/TLS connection */
 
 
 /*
- * End of "$Id: client.c,v 1.91.2.81 2004/04/20 13:40:30 mike Exp $".
+ * End of "$Id: client.c,v 1.91.2.82 2004/06/17 14:45:12 mike Exp $".
  */

diff --git a/scheduler/client.h b/scheduler/client.h
index e6b60a1e2dd145fe50386959ed96d6bcf4331ab4..45e1c894b9babe525a6539402b9567a2ac7c57b1 100644 (file)
--- a/scheduler/client.h
+++ b/scheduler/client.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.h,v 1.17.2.12 2004/03/02 20:56:02 mike Exp $"
+ * "$Id: client.h,v 1.17.2.13 2004/06/17 14:45:12 mike Exp $"
  *
  *   Client definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -71,6 +71,8 @@ VAR int                       ListenBackLog   VALUE(SOMAXCONN),
                                        /* Max backlog of pending connections */
                        LocalPort       VALUE(631);
                                        /* Local port to use */
+VAR http_encryption_t  LocalEncryption VALUE(HTTP_ENCRYPT_IF_REQUESTED);
+                                       /* Local port encryption to use */
 VAR int                        NumListeners    VALUE(0);
                                        /* Number of listening sockets */
 VAR listener_t         *Listeners      VALUE(NULL);
@@ -111,5 +113,5 @@ extern int  WriteClient(client_t *con);
 
 
 /*
- * End of "$Id: client.h,v 1.17.2.12 2004/03/02 20:56:02 mike Exp $".
+ * End of "$Id: client.h,v 1.17.2.13 2004/06/17 14:45:12 mike Exp $".
  */

diff --git a/scheduler/listen.c b/scheduler/listen.c
index cde2abd2fb53abe6c8a6e95b4a959df58af9299f..4e423cff5cd324db95b033cd540dde82fc0b86c7 100644 (file)
--- a/scheduler/listen.c
+++ b/scheduler/listen.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: listen.c,v 1.9.2.13 2004/03/24 21:28:56 mike Exp $"
+ * "$Id: listen.c,v 1.9.2.14 2004/06/17 14:45:12 mike Exp $"
  *
  *   Server listening routines for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -162,7 +162,10 @@ StartListening(void)
     if (!LocalPort &&
         (httpAddrLocalhost(&(lis->address)) ||
          httpAddrAny(&(lis->address))))
-      LocalPort = p;
+    {
+      LocalPort       = p;
+      LocalEncryption = lis->encryption;
+    }
 
    /*
     * Create a socket for listening...
@@ -265,5 +268,5 @@ StopListening(void)
 
 
 /*
- * End of "$Id: listen.c,v 1.9.2.13 2004/03/24 21:28:56 mike Exp $".
+ * End of "$Id: listen.c,v 1.9.2.14 2004/06/17 14:45:12 mike Exp $".
  */