add cache-digests to the header token list

ksss · Jun 30, 2016 · b8fdcb5 · b8fdcb5
1 parent 2a889c0
commit b8fdcb5
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 46 deletions.
diff --git a/include/h2o/token.h b/include/h2o/token.h
@@ -39,50 +39,51 @@
 #define H2O_TOKEN_ALLOW (h2o__tokens + 12)
 #define H2O_TOKEN_AUTHORIZATION (h2o__tokens + 13)
 #define H2O_TOKEN_CACHE_CONTROL (h2o__tokens + 14)
-#define H2O_TOKEN_CONNECTION (h2o__tokens + 15)
-#define H2O_TOKEN_CONTENT_DISPOSITION (h2o__tokens + 16)
-#define H2O_TOKEN_CONTENT_ENCODING (h2o__tokens + 17)
-#define H2O_TOKEN_CONTENT_LANGUAGE (h2o__tokens + 18)
-#define H2O_TOKEN_CONTENT_LENGTH (h2o__tokens + 19)
-#define H2O_TOKEN_CONTENT_LOCATION (h2o__tokens + 20)
-#define H2O_TOKEN_CONTENT_RANGE (h2o__tokens + 21)
-#define H2O_TOKEN_CONTENT_TYPE (h2o__tokens + 22)
-#define H2O_TOKEN_COOKIE (h2o__tokens + 23)
-#define H2O_TOKEN_DATE (h2o__tokens + 24)
-#define H2O_TOKEN_ETAG (h2o__tokens + 25)
-#define H2O_TOKEN_EXPECT (h2o__tokens + 26)
-#define H2O_TOKEN_EXPIRES (h2o__tokens + 27)
-#define H2O_TOKEN_FROM (h2o__tokens + 28)
-#define H2O_TOKEN_HOST (h2o__tokens + 29)
-#define H2O_TOKEN_HTTP2_SETTINGS (h2o__tokens + 30)
-#define H2O_TOKEN_IF_MATCH (h2o__tokens + 31)
-#define H2O_TOKEN_IF_MODIFIED_SINCE (h2o__tokens + 32)
-#define H2O_TOKEN_IF_NONE_MATCH (h2o__tokens + 33)
-#define H2O_TOKEN_IF_RANGE (h2o__tokens + 34)
-#define H2O_TOKEN_IF_UNMODIFIED_SINCE (h2o__tokens + 35)
-#define H2O_TOKEN_KEEP_ALIVE (h2o__tokens + 36)
-#define H2O_TOKEN_LAST_MODIFIED (h2o__tokens + 37)
-#define H2O_TOKEN_LINK (h2o__tokens + 38)
-#define H2O_TOKEN_LOCATION (h2o__tokens + 39)
-#define H2O_TOKEN_MAX_FORWARDS (h2o__tokens + 40)
-#define H2O_TOKEN_PROXY_AUTHENTICATE (h2o__tokens + 41)
-#define H2O_TOKEN_PROXY_AUTHORIZATION (h2o__tokens + 42)
-#define H2O_TOKEN_RANGE (h2o__tokens + 43)
-#define H2O_TOKEN_REFERER (h2o__tokens + 44)
-#define H2O_TOKEN_REFRESH (h2o__tokens + 45)
-#define H2O_TOKEN_RETRY_AFTER (h2o__tokens + 46)
-#define H2O_TOKEN_SERVER (h2o__tokens + 47)
-#define H2O_TOKEN_SET_COOKIE (h2o__tokens + 48)
-#define H2O_TOKEN_STRICT_TRANSPORT_SECURITY (h2o__tokens + 49)
-#define H2O_TOKEN_TE (h2o__tokens + 50)
-#define H2O_TOKEN_TRANSFER_ENCODING (h2o__tokens + 51)
-#define H2O_TOKEN_UPGRADE (h2o__tokens + 52)
-#define H2O_TOKEN_USER_AGENT (h2o__tokens + 53)
-#define H2O_TOKEN_VARY (h2o__tokens + 54)
-#define H2O_TOKEN_VIA (h2o__tokens + 55)
-#define H2O_TOKEN_WWW_AUTHENTICATE (h2o__tokens + 56)
-#define H2O_TOKEN_X_FORWARDED_FOR (h2o__tokens + 57)
-#define H2O_TOKEN_X_REPROXY_URL (h2o__tokens + 58)
-#define H2O_TOKEN_X_TRAFFIC (h2o__tokens + 59)
+#define H2O_TOKEN_CACHE_DIGESTS (h2o__tokens + 15)
+#define H2O_TOKEN_CONNECTION (h2o__tokens + 16)
+#define H2O_TOKEN_CONTENT_DISPOSITION (h2o__tokens + 17)
+#define H2O_TOKEN_CONTENT_ENCODING (h2o__tokens + 18)
+#define H2O_TOKEN_CONTENT_LANGUAGE (h2o__tokens + 19)
+#define H2O_TOKEN_CONTENT_LENGTH (h2o__tokens + 20)
+#define H2O_TOKEN_CONTENT_LOCATION (h2o__tokens + 21)
+#define H2O_TOKEN_CONTENT_RANGE (h2o__tokens + 22)
+#define H2O_TOKEN_CONTENT_TYPE (h2o__tokens + 23)
+#define H2O_TOKEN_COOKIE (h2o__tokens + 24)
+#define H2O_TOKEN_DATE (h2o__tokens + 25)
+#define H2O_TOKEN_ETAG (h2o__tokens + 26)
+#define H2O_TOKEN_EXPECT (h2o__tokens + 27)
+#define H2O_TOKEN_EXPIRES (h2o__tokens + 28)
+#define H2O_TOKEN_FROM (h2o__tokens + 29)
+#define H2O_TOKEN_HOST (h2o__tokens + 30)
+#define H2O_TOKEN_HTTP2_SETTINGS (h2o__tokens + 31)
+#define H2O_TOKEN_IF_MATCH (h2o__tokens + 32)
+#define H2O_TOKEN_IF_MODIFIED_SINCE (h2o__tokens + 33)
+#define H2O_TOKEN_IF_NONE_MATCH (h2o__tokens + 34)
+#define H2O_TOKEN_IF_RANGE (h2o__tokens + 35)
+#define H2O_TOKEN_IF_UNMODIFIED_SINCE (h2o__tokens + 36)
+#define H2O_TOKEN_KEEP_ALIVE (h2o__tokens + 37)
+#define H2O_TOKEN_LAST_MODIFIED (h2o__tokens + 38)
+#define H2O_TOKEN_LINK (h2o__tokens + 39)
+#define H2O_TOKEN_LOCATION (h2o__tokens + 40)
+#define H2O_TOKEN_MAX_FORWARDS (h2o__tokens + 41)
+#define H2O_TOKEN_PROXY_AUTHENTICATE (h2o__tokens + 42)
+#define H2O_TOKEN_PROXY_AUTHORIZATION (h2o__tokens + 43)
+#define H2O_TOKEN_RANGE (h2o__tokens + 44)
+#define H2O_TOKEN_REFERER (h2o__tokens + 45)
+#define H2O_TOKEN_REFRESH (h2o__tokens + 46)
+#define H2O_TOKEN_RETRY_AFTER (h2o__tokens + 47)
+#define H2O_TOKEN_SERVER (h2o__tokens + 48)
+#define H2O_TOKEN_SET_COOKIE (h2o__tokens + 49)
+#define H2O_TOKEN_STRICT_TRANSPORT_SECURITY (h2o__tokens + 50)
+#define H2O_TOKEN_TE (h2o__tokens + 51)
+#define H2O_TOKEN_TRANSFER_ENCODING (h2o__tokens + 52)
+#define H2O_TOKEN_UPGRADE (h2o__tokens + 53)
+#define H2O_TOKEN_USER_AGENT (h2o__tokens + 54)
+#define H2O_TOKEN_VARY (h2o__tokens + 55)
+#define H2O_TOKEN_VIA (h2o__tokens + 56)
+#define H2O_TOKEN_WWW_AUTHENTICATE (h2o__tokens + 57)
+#define H2O_TOKEN_X_FORWARDED_FOR (h2o__tokens + 58)
+#define H2O_TOKEN_X_REPROXY_URL (h2o__tokens + 59)
+#define H2O_TOKEN_X_TRAFFIC (h2o__tokens + 60)
 
 #endif
diff --git a/lib/core/token_table.h b/lib/core/token_table.h
@@ -36,6 +36,7 @@ h2o_token_t h2o__tokens[] = {{{H2O_STRLIT(":authority")}, 1, 0, 0, 0, 0},
                              {{H2O_STRLIT("allow")}, 22, 0, 0, 0, 0},
                              {{H2O_STRLIT("authorization")}, 23, 0, 0, 0, 0},
                              {{H2O_STRLIT("cache-control")}, 24, 0, 0, 0, 0},
+                             {{H2O_STRLIT("cache-digests")}, 0, 0, 0, 0, 0},
                              {{H2O_STRLIT("connection")}, 0, 1, 0, 1, 0},
                              {{H2O_STRLIT("content-disposition")}, 25, 0, 0, 0, 0},
                              {{H2O_STRLIT("content-encoding")}, 26, 0, 0, 0, 0},
@@ -81,7 +82,7 @@ h2o_token_t h2o__tokens[] = {{{H2O_STRLIT(":authority")}, 1, 0, 0, 0, 0},
                              {{H2O_STRLIT("x-forwarded-for")}, 0, 0, 0, 0, 0},
                              {{H2O_STRLIT("x-reproxy-url")}, 0, 0, 0, 0, 0},
                              {{H2O_STRLIT("x-traffic")}, 0, 0, 0, 0, 0}};
-size_t h2o__num_tokens = 60;
+size_t h2o__num_tokens = 61;
 
 const h2o_token_t *h2o_lookup_token(const char *name, size_t len)
 {
@@ -289,6 +290,8 @@ const h2o_token_t *h2o_lookup_token(const char *name, size_t len)
         case 's':
             if (memcmp(name, "accept-range", 12) == 0)
                 return H2O_TOKEN_ACCEPT_RANGES;
+            if (memcmp(name, "cache-digest", 12) == 0)
+                return H2O_TOKEN_CACHE_DIGESTS;
             break;
         }
         break;

diff --git a/misc/tokens.pl b/misc/tokens.pl
@@ -219,3 +219,4 @@ sub normalize_name {
 0 1 0 0 0 keep-alive
 0 0 0 0 0 x-forwarded-for
 0 0 0 0 0 x-traffic
+0 0 0 0 0 cache-digests