From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Thu, 28 Aug 2003 15:16:27 +0000 (+0000)
Subject: Mirror 1.1.x changes.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed6e610e55c568ffb0ba6dfdbbcf7b493d46a75c;p=thirdparty%2Fcups.git

Mirror 1.1.x changes.


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

diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index 91ef036ed4..f9a89c3a2b 100644
--- a/config-scripts/cups-network.m4
+++ b/config-scripts/cups-network.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-network.m4,v 1.1.2.9 2003/04/14 19:56:02 mike Exp $"
+dnl "$Id: cups-network.m4,v 1.1.2.10 2003/08/28 15:16:25 mike Exp $"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -36,13 +36,24 @@ AC_CHECK_HEADER(sys/sockio.h,AC_DEFINE(HAVE_SYS_SOCKIO_H))
 
 AC_SUBST(NETLIBS)
 
-maxfiles=4096
+if test "$uname" = "SunOS"; then
+	case "$uversion" in
+		55* | 56*)
+			maxfiles=1024
+			;;
+		*)
+			maxfiles=4096
+			;;
+	esac
+else
+	maxfiles=4096
+fi
 
-AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file descriptors for CUPS. ],
+AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file descriptors for scheduler ],
 	maxfiles=$withval)
 
 AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)
 
 dnl
-dnl End of "$Id: cups-network.m4,v 1.1.2.9 2003/04/14 19:56:02 mike Exp $".
+dnl End of "$Id: cups-network.m4,v 1.1.2.10 2003/08/28 15:16:25 mike Exp $".
 dnl
diff --git a/cups/http.c b/cups/http.c
index a24b9f260b..944b10bfa6 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c,v 1.82.2.37 2003/08/04 19:01:42 mike Exp $"
+ * "$Id: http.c,v 1.82.2.38 2003/08/28 15:16:26 mike Exp $"
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
@@ -2059,7 +2059,7 @@ http_wait(http_t *http,			/* I - HTTP data */
 
     getrlimit(RLIMIT_NOFILE, &limit);
 
-    http->input_set = calloc(1, (limit.rlim_cur + 7) / 8);
+    http->input_set = calloc(1, (limit.rlim_cur + 31) / 32);
 #endif /* WIN32 */
 
     if (!http->input_set)
@@ -2450,5 +2450,5 @@ CDSAWriteFunc(SSLConnectionRef connection,	/* I  - SSL/TLS connection */
 
 
 /*
- * End of "$Id: http.c,v 1.82.2.37 2003/08/04 19:01:42 mike Exp $".
+ * End of "$Id: http.c,v 1.82.2.38 2003/08/28 15:16:26 mike Exp $".
  */
diff --git a/scheduler/main.c b/scheduler/main.c
index 02002fca84..b0a7b4acce 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c,v 1.57.2.49 2003/08/01 20:09:24 mike Exp $"
+ * "$Id: main.c,v 1.57.2.50 2003/08/28 15:16:27 mike Exp $"
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
@@ -291,7 +291,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   * Allocate memory for the input and output sets...
   */
 
-  SetSize   = (MaxFDs + 7) / 8;
+  SetSize   = (MaxFDs + 31) / 32;
   InputSet  = (fd_set *)calloc(1, SetSize);
   OutputSet = (fd_set *)calloc(1, SetSize);
   input     = (fd_set *)calloc(1, SetSize);
@@ -1112,5 +1112,5 @@ usage(void)
 
 
 /*
- * End of "$Id: main.c,v 1.57.2.49 2003/08/01 20:09:24 mike Exp $".
+ * End of "$Id: main.c,v 1.57.2.50 2003/08/28 15:16:27 mike Exp $".
  */