Move cookie, expect, and IPv6 address stuff to end of http_t structure.

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

diff --git a/cups/http.c b/cups/http.c
index e5a936d40e3677cc8423d8888d33f8129e80b6ff..9e9a82c7f54f4e99ca8f5d61a202e77de1b8fb07 100644 (file)
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c,v 1.82.2.12 2002/05/09 02:22:06 mike Exp $"
+ * "$Id: http.c,v 1.82.2.13 2002/05/09 03:44:17 mike Exp $"
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
@@ -132,9 +132,7 @@ static const char   *http_fields[] =
                          "Content-Range",
                          "Content-Type",
                          "Content-Version",
-                         "Cookie",
                          "Date",
-                         "Expect",
                          "Host",
                          "If-Modified-Since",
                          "If-Unmodified-since",
@@ -145,7 +143,6 @@ static const char   *http_fields[] =
                          "Range",
                          "Referer",
                          "Retry-After",
-                         "Set-Cookie",
                          "Transfer-Encoding",
                          "Upgrade",
                          "User-Agent",
@@ -2273,5 +2270,5 @@ http_upgrade(http_t *http)        /* I - HTTP data */
 
 
 /*
- * End of "$Id: http.c,v 1.82.2.12 2002/05/09 02:22:06 mike Exp $".
+ * End of "$Id: http.c,v 1.82.2.13 2002/05/09 03:44:17 mike Exp $".
  */

diff --git a/cups/http.h b/cups/http.h
index 5600695986e19fd39b3af9ed61484d7257f8e84b..3d3c1e4fd4d95619815de3f556abbeb78f955cea 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.h,v 1.33.2.10 2002/05/09 02:22:07 mike Exp $"
+ * "$Id: http.h,v 1.33.2.11 2002/05/09 03:44:17 mike Exp $"
  *
  *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -230,9 +230,7 @@ typedef enum
   HTTP_FIELD_CONTENT_RANGE,
   HTTP_FIELD_CONTENT_TYPE,
   HTTP_FIELD_CONTENT_VERSION,
-  HTTP_FIELD_COOKIE,
   HTTP_FIELD_DATE,
-  HTTP_FIELD_EXPECT,
   HTTP_FIELD_HOST,
   HTTP_FIELD_IF_MODIFIED_SINCE,
   HTTP_FIELD_IF_UNMODIFIED_SINCE,
@@ -243,7 +241,6 @@ typedef enum
   HTTP_FIELD_RANGE,
   HTTP_FIELD_REFERER,
   HTTP_FIELD_RETRY_AFTER,
-  HTTP_FIELD_SET_COOKIE,
   HTTP_FIELD_TRANSFER_ENCODING,
   HTTP_FIELD_UPGRADE,
   HTTP_FIELD_USER_AGENT,
@@ -280,7 +277,7 @@ typedef struct
   http_status_t                status;         /* Status of last request */
   http_version_t       version;        /* Protocol version */
   http_keepalive_t     keep_alive;     /* Keep-alive supported? */
-  http_addr_t          hostaddr;       /* Host address and port */
+  struct sockaddr_in   oldaddr;        /* Address of connected host */
   char                 hostname[HTTP_MAX_HOST],
                                        /* Name of connected host */
                        fields[HTTP_FIELD_MAX][HTTP_MAX_VALUE];
@@ -298,6 +295,10 @@ typedef struct
   int                  nonce_count;    /* Nonce count */
   void                 *tls;           /* TLS state information */
   http_encryption_t    encryption;     /* Encryption requirements */
+  http_addr_t          hostaddr;       /* Host address and port */
+  http_status_t                expect;         /* Expect: header */
+  char                 cookie[HTTP_MAX_VALUE * 2];
+                                       /* Cookie value(s) */
 } http_t;
 
 
@@ -372,5 +373,5 @@ extern char         *httpAddrString(const http_addr_t *addr,
 #endif /* !_IPP_HTTP_H_ */
 
 /*
- * End of "$Id: http.h,v 1.33.2.10 2002/05/09 02:22:07 mike Exp $".
+ * End of "$Id: http.h,v 1.33.2.11 2002/05/09 03:44:17 mike Exp $".
  */