Update HTTP implementation to support field values larger than HTTP_MAX_VALUE

[thirdparty/cups.git] / cups / http-private.h

diff --git a/cups/http-private.h b/cups/http-private.h
index d528601c5b3658ef778c59ae8e8526e426fd1fc4..6d550a659364daf38a4e1667ddbfe1339e606025 100644 (file)
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,10 +1,11 @@
 /*
  * Private HTTP definitions for CUPS.
  *
- * Copyright 2007-2017 by Apple Inc.
+ * Copyright 2007-2018 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 #ifndef _CUPS_HTTP_PRIVATE_H_
@@ -285,8 +286,8 @@ struct _http_s                              /**** HTTP connection structure ****/
   struct sockaddr_in   _hostaddr;      /* Address of connected host (deprecated) */
   char                 hostname[HTTP_MAX_HOST],
                                        /* Name of connected host */
-                       fields[HTTP_FIELD_ACCEPT_ENCODING][HTTP_MAX_VALUE];
-                                       /* Field values up to Accept-Encoding */
+                       _fields[HTTP_FIELD_ACCEPT_ENCODING][HTTP_MAX_VALUE];
+                                       /* Field values up to Accept-Encoding (deprecated) */
   char                 *data;          /* Pointer to data buffer */
   http_encoding_t      data_encoding;  /* Chunked or not */
   int                  _data_remaining;/* Number of bytes left (deprecated) */
@@ -322,8 +323,6 @@ struct _http_s                              /**** HTTP connection structure ****/
   int                  wused;          /* Write buffer bytes used */
 
   /**** New in CUPS 1.3 ****/
-  char                 *field_authorization;
-                                       /* Authorization field */
   char                 *authstring;    /* Current Authorization field */
 #  ifdef HAVE_GSSAPI
   gss_OID              gssmech;        /* Authentication mechanism */
@@ -348,14 +347,6 @@ struct _http_s                             /**** HTTP connection structure ****/
   /**** New in CUPS 1.7 ****/
   int                  tls_upgrade;    /* Non-zero if we are doing an upgrade */
   _http_mode_t         mode;           /* _HTTP_MODE_CLIENT or _HTTP_MODE_SERVER */
-  char                 *accept_encoding,
-                                       /* Accept-Encoding field */
-                       *allow,         /* Allow field */
-                       *server,        /* Server field */
-                       *default_accept_encoding,
-                       *default_server,
-                       *default_user_agent;
-                                       /* Default field values */
 #  ifdef HAVE_LIBZ
   _http_coding_t       coding;         /* _HTTP_CODING_xxx */
   z_stream             stream;         /* (De)compression stream */
@@ -363,8 +354,10 @@ struct _http_s                             /**** HTTP connection structure ****/
 #  endif /* HAVE_LIBZ */
 
   /**** New in CUPS 2.3 ****/
-  char                 *www_authenticate;
-                                       /* WWW-Authenticate value */
+  char                 *fields[HTTP_FIELD_MAX],
+                                       /* Allocated field values */
+                       *default_fields[HTTP_FIELD_MAX];
+                                       /* Default field values, if any */
 };
 #  endif /* !_HTTP_NO_PRIVATE */