Mirror 1.1.x changes.

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

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 676d78efa77f9b0a7e1ba419ea2726b39e133449..ceb6733b580afac75b40ff8b8c55d0b6e35098f6 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,8 +3,9 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.17
 
-       - The web admin interface now reconnects to the CUPS
-         server to avoid "unauthorized" errors.
+       - Fixed a problem in the scheduler that would cause the
+         web interface problems when adding, modifying, or
+         configuring a printer or class.
        - The backends now ignore SIGPIPE so that failed job
          filters will not stop a print queue.
        - The lpstat command did not allow for destination lists

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index 927be15d4e0ce18b180c9799ede11f84ba7aaee6..f8f7a857c6a55383b04b47b61736ac72c3afa66e 100644 (file)
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: admin.c,v 1.22.2.17 2002/10/15 21:30:27 mike Exp $"
+ * "$Id: admin.c,v 1.22.2.18 2002/10/16 22:13:00 mike Exp $"
  *
  *   Administration CGI for the Common UNIX Printing System (CUPS).
  *
@@ -231,7 +231,6 @@ do_am_class(http_t      *http,              /* I - HTTP connection */
       * Do the request and get back a response...
       */
 
-      httpReconnect(http);
       if ((response = cupsDoRequest(http, request, "/")) != NULL)
       {
        ippSetCGIVars(response, NULL, NULL);
@@ -298,7 +297,6 @@ do_am_class(http_t      *http,              /* I - HTTP connection */
     * Do the request and get back a response...
     */
 
-    httpReconnect(http);
     if ((response = cupsDoRequest(http, request, "/")) != NULL)
     {
      /*
@@ -359,7 +357,6 @@ do_am_class(http_t      *http,              /* I - HTTP connection */
     * Do the request and get back a response...
     */
 
-    httpReconnect(http);
     if ((response = cupsDoRequest(http, request, "/")) != NULL)
     {
       if ((attr = ippFindAttribute(response, "member-uris", IPP_TAG_URI)) != NULL)
@@ -444,7 +441,6 @@ do_am_class(http_t      *http,              /* I - HTTP connection */
     * Do the request and get back a response...
     */
 
-    httpReconnect(http);
     if ((response = cupsDoRequest(http, request, "/admin/")) != NULL)
     {
       status = response->request.status.status_code;
@@ -537,7 +533,6 @@ do_am_printer(http_t      *http,    /* I - HTTP connection */
     * Do the request and get back a response...
     */
 
-    httpReconnect(http);
     oldinfo = cupsDoRequest(http, request, "/");
   }
   else
@@ -613,7 +608,6 @@ do_am_printer(http_t      *http,    /* I - HTTP connection */
     * Do the request and get back a response...
     */
 
-    httpReconnect(http);
     if ((response = cupsDoRequest(http, request, "/")) != NULL)
     {
       ippSetCGIVars(response, NULL, NULL);
@@ -750,7 +744,6 @@ do_am_printer(http_t      *http,    /* I - HTTP connection */
     * Do the request and get back a response...
     */
 
-    httpReconnect(http);
     if ((response = cupsDoRequest(http, request, "/")) != NULL)
     {
       if ((var = cgiGetVariable("PPD_MAKE")) == NULL)
@@ -871,7 +864,6 @@ do_am_printer(http_t      *http,    /* I - HTTP connection */
     * Do the request and get back a response...
     */
 
-    httpReconnect(http);
     if ((response = cupsDoRequest(http, request, "/admin/")) != NULL)
     {
       status = response->request.status.status_code;
@@ -1100,7 +1092,6 @@ do_config_printer(http_t      *http,      /* I - HTTP connection */
     * Do the request and get back a response...
     */
 
-    httpReconnect(http);
     if ((response = cupsDoRequest(http, request, "/")) != NULL)
     {
       if ((attr = ippFindAttribute(response, "job-sheets-supported", IPP_TAG_ZERO)) != NULL)
@@ -1237,7 +1228,6 @@ do_config_printer(http_t      *http,      /* I - HTTP connection */
     * Do the request and get back a response...
     */
 
-    httpReconnect(http);
     if ((response = cupsDoFileRequest(http, request, "/admin/", tempfile)) != NULL)
     {
       status = response->request.status.status_code;
@@ -1318,7 +1308,6 @@ do_delete_class(http_t      *http,        /* I - HTTP connection */
   * Do the request and get back a response...
   */
 
-  httpReconnect(http);
   if ((response = cupsDoRequest(http, request, "/admin/")) != NULL)
   {
     status = response->request.status.status_code;
@@ -1395,7 +1384,6 @@ do_delete_printer(http_t      *http,      /* I - HTTP connection */
   * Do the request and get back a response...
   */
 
-  httpReconnect(http);
   if ((response = cupsDoRequest(http, request, "/admin/")) != NULL)
   {
     status = response->request.status.status_code;
@@ -1467,7 +1455,6 @@ do_printer_op(http_t      *http,  /* I - HTTP connection */
   * Do the request and get back a response...
   */
 
-  httpReconnect(http);
   if ((response = cupsDoRequest(http, request, "/admin/")) != NULL)
   {
     status = response->request.status.status_code;
@@ -1544,5 +1531,5 @@ get_line(char *buf,       /* I - Line buffer */
 
 
 /*
- * End of "$Id: admin.c,v 1.22.2.17 2002/10/15 21:30:27 mike Exp $".
+ * End of "$Id: admin.c,v 1.22.2.18 2002/10/16 22:13:00 mike Exp $".
  */

diff --git a/scheduler/client.c b/scheduler/client.c
index da8f23a5906fb2e307d26e6c5c8da62a333eaaf4..76de7dd43e146e4de9702d769685a22bde9966f3 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c,v 1.91.2.24 2002/10/16 02:35:30 mike Exp $"
+ * "$Id: client.c,v 1.91.2.25 2002/10/16 22:13:01 mike Exp $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -1741,6 +1741,7 @@ ShutdownClient(client_t *con)             /* I - Client connection */
   */
 
   shutdown(con->http.fd, 0);
+  con->http.used = 0;
 
   LogMessage(L_DEBUG2, "ShutdownClient: Removing fd %d from InputSet...",
              con->http.fd);
@@ -2631,5 +2632,5 @@ pipe_command(client_t *con,               /* I - Client connection */
 
 
 /*
- * End of "$Id: client.c,v 1.91.2.24 2002/10/16 02:35:30 mike Exp $".
+ * End of "$Id: client.c,v 1.91.2.25 2002/10/16 22:13:01 mike Exp $".
  */