Drop infodir stuff (not needed)

Don't start server in RPM built from spec file.

Use %config(noreplace) for the config files.

Use Timeout value for client timeout...

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

diff --git a/CHANGES.txt b/CHANGES.txt
index acc77e0c5cd570ade3570865b780d5ebc2509de2..0985f85fe92e94b7cebb5021ea9e6bd665c4234b 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -76,6 +76,9 @@ CHANGES IN CUPS V1.1.7
        - The LPD backend now supports a new "order" option:
          "lpd://server/queue?order=control,data" (default) and
          "lpd://server/queue?order=data,control".
+       - The scheduler enforced a 30 second timeout on all
+         clients regardless of the Timeout directive and if a
+         CGI was currently running.
 
 
 CHANGES IN CUPS V1.1.6-3

diff --git a/cups.spec b/cups.spec
index a64db955b7bb69f5d2e5bd3cf0710073631d14d9..7203c0186bb380ef48ed0cd995e8a4da800a3fd9 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec,v 1.29 2001/02/21 17:01:15 mike Exp $"
+# "$Id: cups.spec,v 1.30 2001/03/06 18:37:49 mike Exp $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
@@ -36,7 +36,7 @@ Packager: Michael Sweet <mike@easysw.com>
 Vendor: Easy Software Products
 # use buildroot so as not to disturb the version already installed
 BuildRoot: /var/tmp/%{name}-root
-Conflicts: lpr
+Conflicts: lpr, LPRng
 
 %package devel
 Summary: Common Unix Printing System - development environment
@@ -94,15 +94,17 @@ if test -x /sbin/chkconfig; then
        /sbin/chkconfig cups on
 fi
 
-if test -f /sbin/init.d/cups; then
-       /sbin/init.d/cups start
-fi
-if test -f /etc/rc.d/init.d/cups; then
-       /etc/rc.d/init.d/cups start
-fi
-if test -f /etc/init.d/cups; then
-       /etc/init.d/cups start
-fi
+# these lines automatically start cupsd after installation; commented out
+# by request...
+#if test -f /sbin/init.d/cups; then
+#      /sbin/init.d/cups start
+#fi
+#if test -f /etc/rc.d/init.d/cups; then
+#      /etc/rc.d/init.d/cups start
+#fi
+#if test -f /etc/init.d/cups; then
+#      /etc/init.d/cups start
+#fi
 
 %preun
 if test -f /sbin/init.d/cups; then
@@ -125,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %dir /etc/cups
-%config /etc/cups/*.conf
+%config(noreplace) /etc/cups/*.conf
 %dir /etc/cups/certs
 %dir /etc/cups/interfaces
 /etc/cups/mime.types
@@ -173,5 +175,5 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/*.a
 
 #
-# End of "$Id: cups.spec,v 1.29 2001/02/21 17:01:15 mike Exp $".
+# End of "$Id: cups.spec,v 1.30 2001/03/06 18:37:49 mike Exp $".
 #

diff --git a/scheduler/main.c b/scheduler/main.c
index 386f133b04c81575ba512fac84a1b228baf46ff3..e38d1d8a9ac6083345d82c3be2974ae44cf3b2dc 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c,v 1.55 2001/03/06 14:23:15 mike Exp $"
+ * "$Id: main.c,v 1.56 2001/03/06 18:37:49 mike Exp $"
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
@@ -352,7 +352,7 @@ main(int  argc,                     /* I - Number of command-line arguments */
 
       for (i = 0, con = Clients; i < NumClients; i ++, con ++)
         LogMessage(L_ERROR, "Clients[%d] = %d, file = %d, state = %d",
-               i, con->http.fd, con->file, con->http.state);
+                  i, con->http.fd, con->file, con->http.state);
 
       for (i = 0, lis = Listeners; i < NumListeners; i ++, lis ++)
         LogMessage(L_ERROR, "Listeners[%d] = %d", i, lis->fd);
@@ -398,8 +398,8 @@ main(int  argc,                     /* I - Number of command-line arguments */
       * Check the activity and close old clients...
       */
 
-      activity = time(NULL) - 30;
-      if (con->http.activity < activity)
+      activity = time(NULL) - Timeout;
+      if (con->http.activity < activity && !con->pipe_pid)
       {
         CloseClient(con);
         con --;
@@ -720,5 +720,5 @@ usage(void)
 
 
 /*
- * End of "$Id: main.c,v 1.55 2001/03/06 14:23:15 mike Exp $".
+ * End of "$Id: main.c,v 1.56 2001/03/06 18:37:49 mike Exp $".
  */