Mirror 1.1.x changes.

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

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 9ad212f20ccb113911386308e0466839cb19b3ff..e1dc807c6322a55ef35990cd3db7ca9ec5a74efd 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,8 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.20rc1
 
+       - Support for more than 1024 files was broken on Solaris
+         9 (STR #217)
        - The setgroups() calls now pass in 1 group (the
          configured group) instead of 0 for compatibility with
          BSD and Darwin (STR #213)

diff --git a/cups/http-private.h b/cups/http-private.h
index d050a6096e13b188542b9cd32a3e687a958f3dcf..e273c21ab5f0ac6f17f058b03a3fc911573f8ce6 100644 (file)
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h,v 1.1.2.2 2003/01/24 19:19:42 mike Exp $"
+ * "$Id: http-private.h,v 1.1.2.3 2003/08/04 19:01:42 mike Exp $"
  *
  *   Private HTTP definitions for the Common UNIX Printing System (CUPS).
  *
@@ -31,9 +31,20 @@
  * Include necessary headers...
  */
 
-#  include "http.h"
 #  include "config.h"
 
+#  ifdef __sun
+/*
+ * Define FD_SETSIZE to CUPS_MAX_FDS on Solaris to get the correct version of
+ * select() for large numbers of file descriptors.
+ */
+
+#    define FD_SETSIZE CUPS_MAX_FDS
+#    include <sys/select.h>
+#  endif /* __sun */
+
+#  include "http.h"
+
 #  if defined HAVE_LIBSSL
 /*
  * The OpenSSL library provides its own SSL/TLS context structure for its
@@ -73,5 +84,5 @@ typedef SSLConnectionRef http_tls_t;
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id: http-private.h,v 1.1.2.2 2003/01/24 19:19:42 mike Exp $".
+ * End of "$Id: http-private.h,v 1.1.2.3 2003/08/04 19:01:42 mike Exp $".
  */

diff --git a/cups/http.c b/cups/http.c
index 04bdef26201f68570bf4f6ce2b16accf784225dc..a24b9f260b59e1cddaccf926d3c51c61dc749d72 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c,v 1.82.2.36 2003/06/02 20:24:19 mike Exp $"
+ * "$Id: http.c,v 1.82.2.37 2003/08/04 19:01:42 mike Exp $"
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
@@ -75,6 +75,8 @@
  * Include necessary headers...
  */
 
+#include "http-private.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -83,7 +85,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "http-private.h"
 #include "ipp.h"
 #include "debug.h"
 
@@ -2449,5 +2450,5 @@ CDSAWriteFunc(SSLConnectionRef connection,        /* I  - SSL/TLS connection */
 
 
 /*
- * End of "$Id: http.c,v 1.82.2.36 2003/06/02 20:24:19 mike Exp $".
+ * End of "$Id: http.c,v 1.82.2.37 2003/08/04 19:01:42 mike Exp $".
  */

diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index 5dfbdbaf097b777071949191a05ca114a27097c2..c3618d2429b2393a7c9f12c3c842fd06d0097f5b 100644 (file)
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -1,97 +1,98 @@
 # DO NOT DELETE
 
-auth.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-auth.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-auth.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-auth.o: client.h auth.h policy.h printers.h classes.h job.h conf.h banners.h
-auth.o: dirsvc.h network.h
-banners.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-banners.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-banners.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-banners.o: client.h auth.h policy.h printers.h classes.h job.h conf.h
-banners.o: banners.h dirsvc.h network.h
-cert.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-cert.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-cert.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-cert.o: client.h auth.h policy.h printers.h classes.h job.h conf.h banners.h
-cert.o: dirsvc.h network.h
-classes.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-classes.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-classes.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-classes.o: client.h auth.h policy.h printers.h classes.h job.h conf.h
-classes.o: banners.h dirsvc.h network.h
-client.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h ../config.h
-client.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h ../cups/string.h
+auth.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+auth.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+auth.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+auth.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+auth.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+banners.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+banners.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+banners.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+banners.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+banners.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+cert.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+cert.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+cert.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+cert.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+cert.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+classes.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+classes.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+classes.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+classes.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+classes.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+client.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+client.o: cupsd.h ../cups/string.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h
 client.o: mime.h ../cups/ipp.h file.h ../cups/http.h ../cups/language.h
 client.o: ../cups/debug.h cert.h client.h auth.h policy.h printers.h
 client.o: classes.h job.h conf.h banners.h dirsvc.h network.h
-conf.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-conf.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-conf.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-conf.o: client.h auth.h policy.h printers.h classes.h job.h conf.h banners.h
-conf.o: dirsvc.h network.h
-devices.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-devices.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-devices.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-devices.o: client.h auth.h policy.h printers.h classes.h job.h conf.h
-devices.o: banners.h dirsvc.h network.h
-dirsvc.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-dirsvc.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-dirsvc.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-dirsvc.o: client.h auth.h policy.h printers.h classes.h job.h conf.h
-dirsvc.o: banners.h dirsvc.h network.h
-main.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-main.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-main.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-main.o: client.h auth.h policy.h printers.h classes.h job.h conf.h banners.h
-main.o: dirsvc.h network.h
-ipp.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-ipp.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h file.h
-ipp.o: ../cups/http.h ../cups/language.h ../cups/debug.h cert.h client.h
-ipp.o: auth.h policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-ipp.o: network.h
-listen.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-listen.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-listen.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-listen.o: client.h auth.h policy.h printers.h classes.h job.h conf.h
-listen.o: banners.h dirsvc.h network.h
-job.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-job.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h file.h
-job.o: ../cups/http.h ../cups/language.h ../cups/debug.h cert.h client.h
-job.o: auth.h policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-job.o: network.h
-log.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-log.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h file.h
-log.o: ../cups/http.h ../cups/language.h ../cups/debug.h cert.h client.h
-log.o: auth.h policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
-log.o: network.h
-network.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-network.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-network.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-network.o: client.h auth.h policy.h printers.h classes.h job.h conf.h
-network.o: banners.h dirsvc.h network.h
-policy.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-policy.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-policy.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-policy.o: client.h auth.h policy.h printers.h classes.h job.h conf.h
-policy.o: banners.h dirsvc.h network.h
-ppds.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-ppds.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-ppds.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-ppds.o: client.h auth.h policy.h printers.h classes.h job.h conf.h banners.h
-ppds.o: dirsvc.h network.h
-printers.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-printers.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-printers.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-printers.o: client.h auth.h policy.h printers.h classes.h job.h conf.h
-printers.o: banners.h dirsvc.h network.h
-quotas.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/md5.h
-quotas.o: ../cups/ppd.h ../cups/string.h ../config.h mime.h ../cups/ipp.h
-quotas.o: file.h ../cups/http.h ../cups/language.h ../cups/debug.h cert.h
-quotas.o: client.h auth.h policy.h printers.h classes.h job.h conf.h
-quotas.o: banners.h dirsvc.h network.h
-server.o: ../cups/http-private.h ../cups/http.h ../cups/md5.h ../config.h
-server.o: cupsd.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h ../cups/string.h
+conf.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+conf.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+conf.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+conf.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+conf.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+devices.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+devices.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+devices.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+devices.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+devices.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+dirsvc.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+dirsvc.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+dirsvc.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+dirsvc.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+dirsvc.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+main.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+main.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+main.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+main.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+main.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+ipp.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+ipp.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+ipp.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+ipp.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+ipp.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+listen.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+listen.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+listen.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+listen.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+listen.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+job.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+job.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+job.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+job.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+job.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+log.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+log.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+log.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+log.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+log.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+network.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+network.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+network.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+network.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+network.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+policy.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+policy.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+policy.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+policy.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+policy.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+ppds.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+ppds.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+ppds.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+ppds.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+ppds.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+printers.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+printers.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+printers.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+printers.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h
+printers.o: policy.h printers.h classes.h job.h conf.h banners.h dirsvc.h
+printers.o: network.h
+quotas.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
+quotas.o: ../cups/md5.h ../cups/string.h ../cups/cups.h ../cups/ipp.h
+quotas.o: ../cups/ppd.h mime.h ../cups/ipp.h file.h ../cups/http.h
+quotas.o: ../cups/language.h ../cups/debug.h cert.h client.h auth.h policy.h
+quotas.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
+server.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
+server.o: cupsd.h ../cups/string.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h
 server.o: mime.h ../cups/ipp.h file.h ../cups/http.h ../cups/language.h
 server.o: ../cups/debug.h cert.h client.h auth.h policy.h printers.h
 server.o: classes.h job.h conf.h banners.h dirsvc.h network.h

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index d26b0942e314bb7d2ca68f983d3f9d3d83d1a0b3..a2614eb4d7bcfd377583d757906571741c2a215a 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsd.h,v 1.28.2.21 2003/08/01 15:21:05 mike Exp $"
+ * "$Id: cupsd.h,v 1.28.2.22 2003/08/04 19:01:44 mike Exp $"
  *
  *   Main header file for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -22,21 +22,13 @@
  *         WWW: http://www.cups.org
  */
 
-#include <cups/string.h>
-#ifdef __sun
-/*
- * Define FD_SETSIZE to CUPS_MAX_FDS on Solaris to get the correct version of
- * select() for large numbers of file descriptors.
- */
-
-#  define FD_SETSIZE   CUPS_MAX_FDS
-#endif /* __sun */
-
 
 /*
  * Include necessary headers.
  */
 
+#include <cups/http-private.h>
+#include <cups/string.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <errno.h>
@@ -216,5 +208,5 @@ extern void StopServer(void);
 
 
 /*
- * End of "$Id: cupsd.h,v 1.28.2.21 2003/08/01 15:21:05 mike Exp $".
+ * End of "$Id: cupsd.h,v 1.28.2.22 2003/08/04 19:01:44 mike Exp $".
  */