Reorder cookie/expect stuff so it can be implemented in 1.1.x first.

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

diff --git a/cups/http.h b/cups/http.h
index 44c7f2e632de10e48fd182b549cb4d402a8c3a1b..7d085a145a42be32c1c8e8f04112ced65323faf3 100644 (file)
--- a/cups/http.h
+++ b/cups/http.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.h,v 1.33.2.15 2003/02/11 18:23:28 mike Exp $"
+ * "$Id: http.h,v 1.33.2.16 2003/03/13 05:11:55 mike Exp $"
  *
  *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -318,11 +318,13 @@ typedef struct
   int                  nonce_count;    /* Nonce count */
   void                 *tls;           /* TLS state information */
   http_encryption_t    encryption;     /* Encryption requirements */
+  /* ADDED IN CUPS 1.1.19 */
   fd_set               *input_set;     /* select() set for httpWait() */
-  http_addr_t          hostaddr;       /* Host address and port */
   http_status_t                expect;         /* Expect: header */
   char                 cookie[HTTP_MAX_VALUE * 2];
                                        /* Cookie value(s) */
+  /* ADDED IN CUPS 1.2 */
+  http_addr_t          hostaddr;       /* Host address and port */
 } http_t;
 
 
@@ -402,5 +404,5 @@ extern char         *httpAddrString(const http_addr_t *addr,
 #endif /* !_IPP_HTTP_H_ */
 
 /*
- * End of "$Id: http.h,v 1.33.2.15 2003/02/11 18:23:28 mike Exp $".
+ * End of "$Id: http.h,v 1.33.2.16 2003/03/13 05:11:55 mike Exp $".
  */