Sort and annotate

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@144 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/include/http_headers.h b/varnish-cache/include/http_headers.h
index 6d02b162506a9db18d8b8832f2b7a9506cf800c1..5db3f09a636cec8b14ef8334ff484d4dde5d52a4 100644 (file)
--- a/varnish-cache/include/http_headers.h
+++ b/varnish-cache/include/http_headers.h
@@ -12,40 +12,53 @@
  *    a                         b                       c  d  e  f  g 
  *--------------------------------------------------------------------
  */
-HTTPH("Connection",            H_Connection,           3, 0, 0, 0, 0)
-HTTPH("Keep-Alive",            H_Keep_Alive,           3, 0, 0, 0, 0)
-HTTPH("Cache-Control",         H_Cache_Control,        3, 1, 0, 0, 0)
 
-HTTPH("Accept-Charset",                H_Accept_Charset,       1, 1, 0, 0, 0)
-HTTPH("Accept-Encoding",       H_Accept_Encoding,      1, 1, 0, 0, 0)
-HTTPH("Accept-Language",       H_Accept_Language,      1, 1, 0, 0, 0)
-HTTPH("Accept",                        H_Accept,               1, 1, 0, 0, 0)
-HTTPH("Authorization",         H_Authorization,        1, 1, 0, 0, 0)
-HTTPH("Expect",                        H_Expect,               1, 1, 0, 0, 0)
-HTTPH("From",                  H_From,                 1, 1, 0, 0, 0)
-HTTPH("Host",                  H_Host,                 1, 1, 0, 0, 0)
-HTTPH("If-Match",              H_If_Match,             1, 1, 0, 0, 0)
-HTTPH("If-Modified-Since",     H_If_Modified_Since,    1, 1, 0, 0, 0)
-HTTPH("If-None-Match",         H_If_None_Match,        1, 1, 0, 0, 0)
-HTTPH("If-Range",              H_If_Range,             1, 1, 0, 0, 0)
-HTTPH("If-Unmodified-Since",   H_If_Unmodifed_Since,   1, 1, 0, 0, 0)
-HTTPH("Max-Forwards",          H_Max_Forwards,         1, 1, 0, 0, 0)
-HTTPH("Proxy-Authorization",   H_Proxy_Authorization,  1, 1, 0, 0, 0)
-HTTPH("Range",                 H_Range,                1, 1, 0, 0, 0)
-HTTPH("Referer",               H_Referer,              1, 1, 0, 0, 0)
-HTTPH("TE",                    H_TE,                   1, 1, 0, 0, 0)
-HTTPH("User-Agent",            H_User_Agent,           1, 1, 0, 0, 0)
-HTTPH("Pragma",                        H_Pragma,               1, 1, 0, 0, 0)
-
-HTTPH("Server",                        H_Server,               2, 1, 0, 0, 0)
-HTTPH("Content-Type",          H_Content_Type,         2, 1, 0, 0, 0)
-HTTPH("Date",                  H_Date,                 2, 1, 0, 0, 0)
-HTTPH("Last-Modified",         H_Last_Modified,        2, 1, 0, 0, 0)
-HTTPH("Accept-Ranges",         H_Accept_Ranges,        2, 1, 0, 0, 0)
-HTTPH("Content-Length",                H_Content_Length,       2, 1, 0, 0, 0)
-HTTPH("Vary",                  H_Vary,                 2, 1, 0, 0, 0)
-HTTPH("Expires",               H_Expires,              2, 1, 0, 0, 0)
-HTTPH("Location",              H_Location,             2, 1, 0, 0, 0)
-HTTPH("Content-Encoding",      H_Content_Encoding,     2, 1, 0, 0, 0)
-HTTPH("ETag:",                         H_ETag,                 2, 1, 0, 0, 0)
+HTTPH("Keep-Alive",            H_Keep_Alive,           3, 0, 0, 0, 0)  /* RFC2068 */
 
+HTTPH("Accept",                        H_Accept,               1, 1, 0, 0, 0)  /* RFC2616 14.1 */
+HTTPH("Accept-Charset",                H_Accept_Charset,       1, 1, 0, 0, 0)  /* RFC2616 14.2 */
+HTTPH("Accept-Encoding",       H_Accept_Encoding,      1, 1, 0, 0, 0)  /* RFC2616 14.3 */
+HTTPH("Accept-Language",       H_Accept_Language,      1, 1, 0, 0, 0)  /* RFC2616 14.4 */
+HTTPH("Accept-Ranges",         H_Accept_Ranges,        2, 1, 0, 0, 0)  /* RFC2616 14.5 */
+HTTPH("Age",                   H_Age,                  2, 1, 0, 0, 0)  /* RFC2616 14.6 */
+HTTPH("Allow",                 H_Allow,                2, 1, 0, 0, 0)  /* RFC2616 14.7 */
+HTTPH("Authorization",         H_Authorization,        1, 1, 0, 0, 0)  /* RFC2616 14.8 */
+HTTPH("Cache-Control",         H_Cache_Control,        3, 1, 0, 0, 0)  /* RFC2616 14.9 */
+HTTPH("Connection",            H_Connection,           3, 0, 0, 0, 0)  /* RFC2616 14.10 */
+HTTPH("Content-Encoding",      H_Content_Encoding,     2, 1, 0, 0, 0)  /* RFC2616 14.11 */
+HTTPH("Content-Langugae",      H_Content_Language,     2, 1, 0, 0, 0)  /* RFC2616 14.12 */
+HTTPH("Content-Length",                H_Content_Length,       2, 1, 0, 0, 0)  /* RFC2616 14.13 */
+HTTPH("Content-Location",      H_Content_Location,     2, 1, 0, 0, 0)  /* RFC2616 14.14 */
+HTTPH("Content-MD5",           H_Content_MD5,          2, 1, 0, 0, 0)  /* RFC2616 14.15 */
+HTTPH("Content-Range",         H_Content_Range,        2, 1, 0, 0, 0)  /* RFC2616 14.16 */
+HTTPH("Content-Type",          H_Content_Type,         2, 1, 0, 0, 0)  /* RFC2616 14.17 */
+HTTPH("Date",                  H_Date,                 2, 1, 0, 0, 0)  /* RFC2616 14.18 */
+HTTPH("ETag",                  H_ETag,                 2, 1, 0, 0, 0)  /* RFC2616 14.19 */
+HTTPH("Expect",                        H_Expect,               1, 1, 0, 0, 0)  /* RFC2616 14.20 */
+HTTPH("Expires",               H_Expires,              2, 1, 0, 0, 0)  /* RFC2616 14.21 */
+HTTPH("From",                  H_From,                 1, 1, 0, 0, 0)  /* RFC2616 14.22 */
+HTTPH("Host",                  H_Host,                 1, 1, 0, 0, 0)  /* RFC2616 14.23 */
+HTTPH("If-Match",              H_If_Match,             1, 1, 0, 0, 0)  /* RFC2616 14.24 */
+HTTPH("If-Modified-Since",     H_If_Modified_Since,    1, 1, 0, 0, 0)  /* RFC2616 14.25 */
+HTTPH("If-None-Match",         H_If_None_Match,        1, 1, 0, 0, 0)  /* RFC2616 14.26 */
+HTTPH("If-Range",              H_If_Range,             1, 1, 0, 0, 0)  /* RFC2616 14.27 */
+HTTPH("If-Unmodified-Since",   H_If_Unmodifed_Since,   1, 1, 0, 0, 0)  /* RFC2616 14.28 */
+HTTPH("Last-Modified",         H_Last_Modified,        2, 1, 0, 0, 0)  /* RFC2616 14.29 */
+HTTPH("Location",              H_Location,             2, 1, 0, 0, 0)  /* RFC2616 14.30 */
+HTTPH("Max-Forwards",          H_Max_Forwards,         1, 1, 0, 0, 0)  /* RFC2616 14.31 */
+HTTPH("Pragma",                        H_Pragma,               1, 1, 0, 0, 0)  /* RFC2616 14.32 */
+HTTPH("Proxy-Authenticate",    H_Proxy_Authenticate,   2, 1, 0, 0, 0)  /* RFC2616 14.33 */
+HTTPH("Proxy-Authorization",   H_Proxy_Authorization,  1, 1, 0, 0, 0)  /* RFC2616 14.34 */
+HTTPH("Range",                 H_Range,                1, 1, 0, 0, 0)  /* RFC2616 14.35 */
+HTTPH("Referer",               H_Referer,              1, 1, 0, 0, 0)  /* RFC2616 14.36 */
+HTTPH("Retry-After",           H_Retry_After,          2, 1, 0, 0, 0)  /* RFC2616 14.37 */
+HTTPH("Server",                        H_Server,               2, 1, 0, 0, 0)  /* RFC2616 14.38 */
+HTTPH("TE",                    H_TE,                   1, 1, 0, 0, 0)  /* RFC2616 14.39 */
+HTTPH("Trailer",               H_Trailer,              1, 1, 0, 0, 0)  /* RFC2616 14.40 */
+HTTPH("Transfer-Encoding",     H_Transfer_Encoding,    2, 1, 0, 0, 0)  /* RFC2616 14.41 */
+HTTPH("Upgrade",               H_Upgrade,              2, 1, 0, 0, 0)  /* RFC2616 14.42 */
+HTTPH("User-Agent",            H_User_Agent,           1, 1, 0, 0, 0)  /* RFC2616 14.43 */
+HTTPH("Vary",                  H_Vary,                 2, 1, 0, 0, 0)  /* RFC2616 14.44 */
+HTTPH("Via",                   H_Via,                  2, 1, 0, 0, 0)  /* RFC2616 14.45 */
+HTTPH("Warning",               H_Warning,              2, 1, 0, 0, 0)  /* RFC2616 14.46 */
+HTTPH("WWW-Authenticate",      H_WWW_Authenticate,     2, 1, 0, 0, 0)  /* RFC2616 14.47 */