Merge changes from CUPS 1.4svn-r7961.

[thirdparty/cups.git] / scheduler / client.h

diff --git a/scheduler/client.h b/scheduler/client.h
index cfdf6e37cde3c3a9bf2eea9dabb370c0223dc093..6ea7208890aa84ece980b945fca1287a4f3058e4 100644 (file)
--- a/scheduler/client.h
+++ b/scheduler/client.h
@@ -1,31 +1,23 @@
 /*
- * "$Id: client.h 6570 2007-06-19 18:10:48Z mike $"
+ * "$Id: client.h 7935 2008-09-11 01:54:11Z mike $"
  *
  *   Client definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifdef HAVE_AUTHORIZATION_H
 #  include <Security/Authorization.h>
 #endif /* HAVE_AUTHORIZATION_H */
 
+
 /*
  * HTTP client structure...
  */
@@ -39,7 +31,8 @@ struct cupsd_client_s
   time_t               start;          /* Request start time */
   http_state_t         operation;      /* Request operation */
   off_t                        bytes;          /* Bytes transferred for this request */
-  char                 username[33],   /* Username from Authorization: line */
+  int                  type;           /* AuthType for username */
+  char                 username[256],  /* Username from Authorization: line */
                        password[33],   /* Password from Authorization: line */
                        uri[HTTP_MAX_URI],
                                        /* Localized URL/URI for GET/PUT */
@@ -62,7 +55,6 @@ struct cupsd_client_s
   int                  serverport;     /* Server port for connection */
 #ifdef HAVE_GSSAPI
   int                  gss_have_creds; /* Have authenticated credentials */
-  int                  no_negotiate;   /* Don't offer WWW-Authenticate: Negotiate */
   gss_buffer_desc      gss_output_token;
                                        /* Output token for Negotiate header */
   gss_cred_id_t        gss_delegated_cred;
@@ -100,8 +92,12 @@ VAR http_encryption_t       LocalEncryption VALUE(HTTP_ENCRYPT_IF_REQUESTED);
                                        /* Local port encryption to use */
 VAR cups_array_t       *Listeners      VALUE(NULL);
                                        /* Listening sockets */
-VAR cups_array_t       *Clients        VALUE(NULL);
+VAR time_t             ListeningPaused VALUE(0);
+                                       /* Time when listening was paused */
+VAR cups_array_t       *Clients        VALUE(NULL),
                                        /* HTTP clients */
+                       *ActiveClients  VALUE(NULL);
+                                       /* Active HTTP clients */
 VAR http_addrlist_t    *ServerAddrs    VALUE(NULL);
                                        /* Server address(es) */
 VAR char               *ServerHeader   VALUE(NULL);
@@ -139,5 +135,5 @@ extern void cupsdWriteClient(cupsd_client_t *con);
 
 
 /*
- * End of "$Id: client.h 6570 2007-06-19 18:10:48Z mike $".
+ * End of "$Id: client.h 7935 2008-09-11 01:54:11Z mike $".
  */