2.1 branch merge

[thirdparty/squid.git] / src / enums.h

diff --git a/src/enums.h b/src/enums.h
index 4470f4f31ceef87586084b361ded8b7b08d4cd07..6d2174b81c19f3188f8dc7c0d7448a57ab3aa8a8 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.136 1998/11/11 20:04:15 glenn Exp $
+ * $Id: enums.h,v 1.137 1998/11/12 06:28:04 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -97,7 +97,7 @@ typedef enum {
     ACL_URLPATH_REGEX,
     ACL_URL_REGEX,
     ACL_URL_PORT,
-    ACL_USER,
+    ACL_IDENT,
     ACL_PROTO,
     ACL_METHOD,
     ACL_BROWSER,
@@ -115,9 +115,7 @@ typedef enum {
     ACL_LOOKUP_NEEDED,
     ACL_LOOKUP_PENDING,
     ACL_LOOKUP_DONE,
-    ACL_PROXY_AUTH_NEEDED,
-    ACL_PROXY_AUTH_USED,
-    ACL_PROXY_AUTH_CHECK
+    ACL_PROXY_AUTH_NEEDED
 } acl_lookup_state;
 
 enum {
@@ -200,7 +198,9 @@ typedef enum {
     HDR_EXPIRES,
     HDR_FROM,
     HDR_HOST,
+    HDR_IF_MATCH,
     HDR_IF_MODIFIED_SINCE,
+    HDR_IF_NONE_MATCH,
     HDR_IF_RANGE,
     HDR_LAST_MODIFIED,
     HDR_LINK,
@@ -473,84 +473,91 @@ enum {
 
 typedef enum {
     MEM_NONE,
-    MEM_DONTFREE,
-    MEM_DISK_BUF,
-    MEM_STMEM_BUF,
     MEM_2K_BUF,
     MEM_4K_BUF,
     MEM_8K_BUF,
-    MEM_CLIENT_SOCK_BUF,
-    MEM_ACL_IP_DATA,
-    MEM_ACL_TIME_DATA,
-    MEM_ACL_NAME_LIST,
-    MEM_ACL_DENY_INFO_LIST,
+    MEM_ACCESSLOGENTRY,
     MEM_ACL,
-    MEM_ACL_LIST,
+    MEM_ACLCHECK_T,
     MEM_ACL_ACCESS,
+    MEM_ACL_DENY_INFO_LIST,
+    MEM_ACL_IP_DATA,
+    MEM_ACL_LIST,
+    MEM_ACL_NAME_LIST,
     MEM_ACL_PROXY_AUTH_USER,
-    MEM_ACLCHECK_T,
+    MEM_ACL_TIME_DATA,
     MEM_AIO_RESULT_T,
-    MEM_WORDLIST,
-    MEM_INTLIST,
-    MEM_USHORTLIST,
-    MEM_RELIST,
-    MEM_SQUIDCONFIG,
-    MEM_SQUIDCONFIG2,
+    MEM_CACHEMGR_PASSWD,
+#if USE_CACHE_DIGESTS
+    MEM_CACHE_DIGEST,
+#endif
+    MEM_CLIENTHTTPREQUEST,
+    MEM_CLIENT_INFO,
+    MEM_CLIENT_SOCK_BUF,
     MEM_CLOSE_HANDLER,
-    MEM_DREAD_CTRL,
+    MEM_COMMWRITESTATEDATA,
+    MEM_CONNSTATEDATA,
+#if USE_CACHE_DIGESTS
+    MEM_DIGEST_FETCH_STATE,
+#endif
+    MEM_DISK_BUF,
+    MEM_DLINK_LIST,
+    MEM_DLINK_NODE,
     MEM_DNSSERVER_T,
     MEM_DNSSTATDATA,
+    MEM_DOMAIN_PING,
+    MEM_DOMAIN_TYPE,
+    MEM_DONTFREE,
+    MEM_DREAD_CTRL,
     MEM_DWRITE_Q,
+    MEM_ERRORSTATE,
     MEM_FILEMAP,
     MEM_FQDNCACHE_ENTRY,
     MEM_FQDNCACHE_PENDING,
-    MEM_FWD_STATE,
     MEM_FWD_SERVER,
+    MEM_FWD_STATE,
     MEM_HASH_LINK,
     MEM_HASH_TABLE,
-    MEM_HTTP_REPLY,
-    MEM_HTTP_HDR_ENTRY,
+    MEM_HELPER,
+    MEM_HELPER_REQUEST,
+    MEM_HELPER_SERVER,
+    MEM_HIERARCHYLOGENTRY,
     MEM_HTTP_HDR_CC,
-    MEM_HTTP_HDR_RANGE_SPEC,
-    MEM_HTTP_HDR_RANGE,
     MEM_HTTP_HDR_CONTENT_RANGE,
+    MEM_HTTP_HDR_ENTRY,
+    MEM_HTTP_HDR_RANGE,
+    MEM_HTTP_HDR_RANGE_SPEC,
+    MEM_HTTP_REPLY,
     MEM_HTTP_STATE_DATA,
     MEM_ICPUDPDATA,
-    MEM_CLIENTHTTPREQUEST,
-    MEM_CONNSTATEDATA,
-    MEM_IPCACHE_PENDING,
+    MEM_ICP_COMMON_T,
+    MEM_ICP_PING_DATA,
+    MEM_INTLIST,
+    MEM_IOSTATS,
     MEM_IPCACHE_ENTRY,
-    MEM_DOMAIN_PING,
-    MEM_DOMAIN_TYPE,
-    MEM_DIGEST_FETCH_STATE,
-    MEM_PEER,
+    MEM_IPCACHE_PENDING,
+    MEM_MD5_DIGEST,
+    MEM_MEMOBJECT,
+    MEM_MEM_NODE,
+    MEM_NETDBENTRY,
     MEM_NET_DB_NAME,
     MEM_NET_DB_PEER,
-    MEM_NETDBENTRY,
-    MEM_ICP_PING_DATA,
-    MEM_PS_STATE,
-    MEM_HIERARCHYLOGENTRY,
+    MEM_PEER,
     MEM_PINGERECHODATA,
     MEM_PINGERREPLYDATA,
-    MEM_ICP_COMMON_T,
-    MEM_IOSTATS,
-    MEM_MEM_NODE,
-    MEM_STORE_CLIENT,
-    MEM_MEMOBJECT,
-    MEM_STOREENTRY,
-    MEM_SWAPDIR,
-    MEM_REQUEST_T,
-    MEM_ACCESSLOGENTRY,
-    MEM_CACHE_DIGEST,
-    MEM_CACHEMGR_PASSWD,
+    MEM_PS_STATE,
     MEM_REFRESH_T,
-    MEM_COMMWRITESTATEDATA,
-    MEM_ERRORSTATE,
-    MEM_DLINK_NODE,
-    MEM_DLINK_LIST,
+    MEM_RELIST,
+    MEM_REQUEST_T,
+    MEM_SQUIDCONFIG,
+    MEM_SQUIDCONFIG2,
     MEM_STATCOUNTERS,
-    MEM_CLIENT_INFO,
-    MEM_MD5_DIGEST,
+    MEM_STMEM_BUF,
+    MEM_STOREENTRY,
+    MEM_STORE_CLIENT,
+    MEM_SWAPDIR,
+    MEM_USHORTLIST,
+    MEM_WORDLIST,
     MEM_MAX
 } mem_type;