Remove extra tokenization of header names; they are not effective at best

genlibtokenlookup.py

@@ -62,67 +62,11 @@ HEADERS = [
     ('vary', 58),
     ('via', 59),
     ('www-authenticate', 60),
-    ('accept-ch', None),
-    ('accept-datetime', None),
-    ('accept-features', None),
-    ('accept-patch', None),
-    ('access-control-allow-credentials', None),
-    ('access-control-allow-headers', None),
-    ('access-control-allow-methods', None),
-    ('access-control-expose-headers', None),
-    ('access-control-max-age', None),
-    ('access-control-request-headers', None),
-    ('access-control-request-method', None),
-    ('alt-svc', None),
-    ('alternates', None),
-    ('connection', None),
-    ('content-md5', None),
-    ('content-security-policy', None),
-    ('content-security-policy-report-only', None),
-    ('dnt', None),
-    ('forwarded', None),
-    ('front-end-https', None),
-    ('keep-alive', None),
-    ('last-event-id', None),
-    ('negotiate', None),
-    ('origin', None),
-    ('p3p', None),
-    ('pragma', None),
-    ('proxy-connection', None),
-    ('public-key-pins', None),
-    ('sec-websocket-extensions', None),
-    ('sec-websocket-key', None),
-    ('sec-websocket-origin', None),
-    ('sec-websocket-protocol', None),
-    ('sec-websocket-version', None),
-    ('set-cookie2', None),
-    ('status', None),
-    ('tcn', None),
     ('te', None),
-    ('trailer', None),
+    ('connection', None),
-    ('tsv', None),
+    ('keep-alive',None),
+    ('proxy-connection', None),
     ('upgrade', None),
-    ('upgrade-insecure-requests', None),
-    ('variant-vary', None),
-    ('warning', None),
-    ('x-api-version', None),
-    ('x-att-deviceid', None),
-    ('x-cache', None),
-    ('x-cache-lookup', None),
-    ('x-content-duration', None),
-    ('x-content-security-policy', None),
-    ('x-content-type-options', None),
-    ('x-dnsprefetch-control', None),
-    ('x-forwarded-for', None),
-    ('x-forwarded-host', None),
-    ('x-forwarded-proto', None),
-    ('x-frame-options', None),
-    ('x-powered-by', None),
-    ('x-requested-with', None),
-    ('x-ua-compatible', None),
-    ('x-wap-profile', None),
-    ('x-webkit-csp', None),
-    ('x-xss-protection', None),
 ]
 
 def to_enum_hd(k):

lib/nghttp2_hd.c

@@ -139,26 +139,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
         return NGHTTP2_TOKEN_AGE;
       }
       break;
-    case 'n':
-      if (lstreq("tc", name, 2)) {
-        return NGHTTP2_TOKEN_TCN;
-      }
-      break;
-    case 'p':
-      if (lstreq("p3", name, 2)) {
-        return NGHTTP2_TOKEN_P3P;
-      }
-      break;
-    case 't':
-      if (lstreq("dn", name, 2)) {
-        return NGHTTP2_TOKEN_DNT;
-      }
-      break;
-    case 'v':
-      if (lstreq("ts", name, 2)) {
-        return NGHTTP2_TOKEN_TSV;
-      }
-      break;
     }
     break;
   case 4:
@@ -219,31 +199,16 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
     break;
   case 6:
     switch (name[5]) {
-    case 'a':
-      if (lstreq("pragm", name, 5)) {
-        return NGHTTP2_TOKEN_PRAGMA;
-      }
-      break;
     case 'e':
       if (lstreq("cooki", name, 5)) {
         return NGHTTP2_TOKEN_COOKIE;
       }
       break;
-    case 'n':
-      if (lstreq("origi", name, 5)) {
-        return NGHTTP2_TOKEN_ORIGIN;
-      }
-      break;
     case 'r':
       if (lstreq("serve", name, 5)) {
         return NGHTTP2_TOKEN_SERVER;
       }
       break;
-    case 's':
-      if (lstreq("statu", name, 5)) {
-        return NGHTTP2_TOKEN_STATUS;
-      }
-      break;
     case 't':
       if (lstreq("accep", name, 5)) {
         return NGHTTP2_TOKEN_ACCEPT;
@@ -256,11 +221,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
     break;
   case 7:
     switch (name[6]) {
-    case 'c':
-      if (lstreq("alt-sv", name, 6)) {
-        return NGHTTP2_TOKEN_ALT_SVC;
-      }
-      break;
     case 'd':
       if (lstreq(":metho", name, 6)) {
         return NGHTTP2_TOKEN__METHOD;
@@ -279,14 +239,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
       if (lstreq("upgrad", name, 6)) {
         return NGHTTP2_TOKEN_UPGRADE;
       }
-      if (lstreq("x-cach", name, 6)) {
-        return NGHTTP2_TOKEN_X_CACHE;
-      }
-      break;
-    case 'g':
-      if (lstreq("warnin", name, 6)) {
-        return NGHTTP2_TOKEN_WARNING;
-      }
       break;
     case 'h':
       if (lstreq("refres", name, 6)) {
@@ -297,9 +249,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
       if (lstreq("refere", name, 6)) {
         return NGHTTP2_TOKEN_REFERER;
       }
-      if (lstreq("traile", name, 6)) {
-        return NGHTTP2_TOKEN_TRAILER;
-      }
       break;
     case 's':
       if (lstreq(":statu", name, 6)) {
@@ -348,25 +297,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
       break;
     }
     break;
-  case 9:
-    switch (name[8]) {
-    case 'd':
-      if (lstreq("forwarde", name, 8)) {
-        return NGHTTP2_TOKEN_FORWARDED;
-      }
-      break;
-    case 'e':
-      if (lstreq("negotiat", name, 8)) {
-        return NGHTTP2_TOKEN_NEGOTIATE;
-      }
-      break;
-    case 'h':
-      if (lstreq("accept-c", name, 8)) {
-        return NGHTTP2_TOKEN_ACCEPT_CH;
-      }
-      break;
-    }
-    break;
   case 10:
     switch (name[9]) {
     case 'e':
@@ -382,11 +312,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
         return NGHTTP2_TOKEN_CONNECTION;
       }
       break;
-    case 's':
-      if (lstreq("alternate", name, 9)) {
-        return NGHTTP2_TOKEN_ALTERNATES;
-      }
-      break;
     case 't':
       if (lstreq("user-agen", name, 9)) {
         return NGHTTP2_TOKEN_USER_AGENT;
@@ -401,16 +326,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
     break;
   case 11:
     switch (name[10]) {
-    case '2':
-      if (lstreq("set-cookie", name, 10)) {
-        return NGHTTP2_TOKEN_SET_COOKIE2;
-      }
-      break;
-    case '5':
-      if (lstreq("content-md", name, 10)) {
-        return NGHTTP2_TOKEN_CONTENT_MD5;
-      }
-      break;
     case 'r':
       if (lstreq("retry-afte", name, 10)) {
         return NGHTTP2_TOKEN_RETRY_AFTER;
@@ -425,37 +340,16 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
         return NGHTTP2_TOKEN_CONTENT_TYPE;
       }
       break;
-    case 'h':
-      if (lstreq("accept-patc", name, 11)) {
-        return NGHTTP2_TOKEN_ACCEPT_PATCH;
-      }
-      break;
-    case 'p':
-      if (lstreq("x-webkit-cs", name, 11)) {
-        return NGHTTP2_TOKEN_X_WEBKIT_CSP;
-      }
-      break;
     case 's':
       if (lstreq("max-forward", name, 11)) {
         return NGHTTP2_TOKEN_MAX_FORWARDS;
       }
       break;
-    case 'y':
-      if (lstreq("variant-var", name, 11)) {
-        return NGHTTP2_TOKEN_VARIANT_VARY;
-      }
-      if (lstreq("x-powered-b", name, 11)) {
-        return NGHTTP2_TOKEN_X_POWERED_BY;
-      }
-      break;
     }
     break;
   case 13:
     switch (name[12]) {
     case 'd':
-      if (lstreq("last-event-i", name, 12)) {
-        return NGHTTP2_TOKEN_LAST_EVENT_ID;
-      }
       if (lstreq("last-modifie", name, 12)) {
         return NGHTTP2_TOKEN_LAST_MODIFIED;
       }
@@ -464,9 +358,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
       if (lstreq("content-rang", name, 12)) {
         return NGHTTP2_TOKEN_CONTENT_RANGE;
       }
-      if (lstreq("x-wap-profil", name, 12)) {
-        return NGHTTP2_TOKEN_X_WAP_PROFILE;
-      }
       break;
     case 'h':
       if (lstreq("if-none-matc", name, 12)) {
@@ -482,9 +373,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
       if (lstreq("authorizatio", name, 12)) {
         return NGHTTP2_TOKEN_AUTHORIZATION;
       }
-      if (lstreq("x-api-versio", name, 12)) {
-        return NGHTTP2_TOKEN_X_API_VERSION;
-      }
       break;
     case 's':
       if (lstreq("accept-range", name, 12)) {
@@ -495,21 +383,11 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
     break;
   case 14:
     switch (name[13]) {
-    case 'd':
-      if (lstreq("x-att-devicei", name, 13)) {
-        return NGHTTP2_TOKEN_X_ATT_DEVICEID;
-      }
-      break;
     case 'h':
       if (lstreq("content-lengt", name, 13)) {
         return NGHTTP2_TOKEN_CONTENT_LENGTH;
       }
       break;
-    case 'p':
-      if (lstreq("x-cache-looku", name, 13)) {
-        return NGHTTP2_TOKEN_X_CACHE_LOOKUP;
-      }
-      break;
     case 't':
       if (lstreq("accept-charse", name, 13)) {
         return NGHTTP2_TOKEN_ACCEPT_CHARSET;
@@ -520,40 +398,15 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
   case 15:
     switch (name[14]) {
     case 'e':
-      if (lstreq("accept-datetim", name, 14)) {
-        return NGHTTP2_TOKEN_ACCEPT_DATETIME;
-      }
       if (lstreq("accept-languag", name, 14)) {
         return NGHTTP2_TOKEN_ACCEPT_LANGUAGE;
       }
-      if (lstreq("x-ua-compatibl", name, 14)) {
-        return NGHTTP2_TOKEN_X_UA_COMPATIBLE;
-      }
       break;
     case 'g':
       if (lstreq("accept-encodin", name, 14)) {
         return NGHTTP2_TOKEN_ACCEPT_ENCODING;
       }
       break;
-    case 'r':
-      if (lstreq("x-forwarded-fo", name, 14)) {
-        return NGHTTP2_TOKEN_X_FORWARDED_FOR;
-      }
-      break;
-    case 's':
-      if (lstreq("accept-feature", name, 14)) {
-        return NGHTTP2_TOKEN_ACCEPT_FEATURES;
-      }
-      if (lstreq("front-end-http", name, 14)) {
-        return NGHTTP2_TOKEN_FRONT_END_HTTPS;
-      }
-      if (lstreq("public-key-pin", name, 14)) {
-        return NGHTTP2_TOKEN_PUBLIC_KEY_PINS;
-      }
-      if (lstreq("x-frame-option", name, 14)) {
-        return NGHTTP2_TOKEN_X_FRAME_OPTIONS;
-      }
-      break;
     }
     break;
   case 16:
@@ -571,11 +424,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
         return NGHTTP2_TOKEN_CONTENT_ENCODING;
       }
       break;
-    case 'h':
-      if (lstreq("x-requested-wit", name, 15)) {
-        return NGHTTP2_TOKEN_X_REQUESTED_WITH;
-      }
-      break;
     case 'n':
       if (lstreq("content-locatio", name, 15)) {
         return NGHTTP2_TOKEN_CONTENT_LOCATION;
@@ -583,14 +431,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
       if (lstreq("proxy-connectio", name, 15)) {
         return NGHTTP2_TOKEN_PROXY_CONNECTION;
       }
-      if (lstreq("x-xss-protectio", name, 15)) {
-        return NGHTTP2_TOKEN_X_XSS_PROTECTION;
-      }
-      break;
-    case 't':
-      if (lstreq("x-forwarded-hos", name, 15)) {
-        return NGHTTP2_TOKEN_X_FORWARDED_HOST;
-      }
       break;
     }
     break;
@@ -606,16 +446,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
         return NGHTTP2_TOKEN_TRANSFER_ENCODING;
       }
       break;
-    case 'o':
-      if (lstreq("x-forwarded-prot", name, 16)) {
-        return NGHTTP2_TOKEN_X_FORWARDED_PROTO;
-      }
-      break;
-    case 'y':
-      if (lstreq("sec-websocket-ke", name, 16)) {
-        return NGHTTP2_TOKEN_SEC_WEBSOCKET_KEY;
-      }
-      break;
     }
     break;
   case 18:
@@ -625,11 +455,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
         return NGHTTP2_TOKEN_PROXY_AUTHENTICATE;
       }
       break;
-    case 'n':
-      if (lstreq("x-content-duratio", name, 17)) {
-        return NGHTTP2_TOKEN_X_CONTENT_DURATION;
-      }
-      break;
     }
     break;
   case 19:
@@ -649,80 +474,12 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
       break;
     }
     break;
-  case 20:
-    switch (name[19]) {
-    case 'n':
-      if (lstreq("sec-websocket-origi", name, 19)) {
-        return NGHTTP2_TOKEN_SEC_WEBSOCKET_ORIGIN;
-      }
-      break;
-    }
-    break;
-  case 21:
-    switch (name[20]) {
-    case 'l':
-      if (lstreq("x-dnsprefetch-contro", name, 20)) {
-        return NGHTTP2_TOKEN_X_DNSPREFETCH_CONTROL;
-      }
-      break;
-    case 'n':
-      if (lstreq("sec-websocket-versio", name, 20)) {
-        return NGHTTP2_TOKEN_SEC_WEBSOCKET_VERSION;
-      }
-      break;
-    }
-    break;
-  case 22:
-    switch (name[21]) {
-    case 'e':
-      if (lstreq("access-control-max-ag", name, 21)) {
-        return NGHTTP2_TOKEN_ACCESS_CONTROL_MAX_AGE;
-      }
-      break;
-    case 'l':
-      if (lstreq("sec-websocket-protoco", name, 21)) {
-        return NGHTTP2_TOKEN_SEC_WEBSOCKET_PROTOCOL;
-      }
-      break;
-    case 's':
-      if (lstreq("x-content-type-option", name, 21)) {
-        return NGHTTP2_TOKEN_X_CONTENT_TYPE_OPTIONS;
-      }
-      break;
-    }
-    break;
-  case 23:
-    switch (name[22]) {
-    case 'y':
-      if (lstreq("content-security-polic", name, 22)) {
-        return NGHTTP2_TOKEN_CONTENT_SECURITY_POLICY;
-      }
-      break;
-    }
-    break;
-  case 24:
-    switch (name[23]) {
-    case 's':
-      if (lstreq("sec-websocket-extension", name, 23)) {
-        return NGHTTP2_TOKEN_SEC_WEBSOCKET_EXTENSIONS;
-      }
-      break;
-    }
-    break;
   case 25:
     switch (name[24]) {
-    case 's':
-      if (lstreq("upgrade-insecure-request", name, 24)) {
-        return NGHTTP2_TOKEN_UPGRADE_INSECURE_REQUESTS;
-      }
-      break;
     case 'y':
       if (lstreq("strict-transport-securit", name, 24)) {
         return NGHTTP2_TOKEN_STRICT_TRANSPORT_SECURITY;
       }
-      if (lstreq("x-content-security-polic", name, 24)) {
-        return NGHTTP2_TOKEN_X_CONTENT_SECURITY_POLICY;
-      }
       break;
     }
     break;
@@ -735,59 +492,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
       break;
     }
     break;
-  case 28:
-    switch (name[27]) {
-    case 's':
-      if (lstreq("access-control-allow-header", name, 27)) {
-        return NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_HEADERS;
-      }
-      if (lstreq("access-control-allow-method", name, 27)) {
-        return NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_METHODS;
-      }
-      break;
-    }
-    break;
-  case 29:
-    switch (name[28]) {
-    case 'd':
-      if (lstreq("access-control-request-metho", name, 28)) {
-        return NGHTTP2_TOKEN_ACCESS_CONTROL_REQUEST_METHOD;
-      }
-      break;
-    case 's':
-      if (lstreq("access-control-expose-header", name, 28)) {
-        return NGHTTP2_TOKEN_ACCESS_CONTROL_EXPOSE_HEADERS;
-      }
-      break;
-    }
-    break;
-  case 30:
-    switch (name[29]) {
-    case 's':
-      if (lstreq("access-control-request-header", name, 29)) {
-        return NGHTTP2_TOKEN_ACCESS_CONTROL_REQUEST_HEADERS;
-      }
-      break;
-    }
-    break;
-  case 32:
-    switch (name[31]) {
-    case 's':
-      if (lstreq("access-control-allow-credential", name, 31)) {
-        return NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_CREDENTIALS;
-      }
-      break;
-    }
-    break;
-  case 35:
-    switch (name[34]) {
-    case 'y':
-      if (lstreq("content-security-policy-report-onl", name, 34)) {
-        return NGHTTP2_TOKEN_CONTENT_SECURITY_POLICY_REPORT_ONLY;
-      }
-      break;
-    }
-    break;
   }
   return -1;
 }

lib/nghttp2_hd.h

@@ -106,67 +106,11 @@ typedef enum {
   NGHTTP2_TOKEN_VARY = 58,
   NGHTTP2_TOKEN_VIA = 59,
   NGHTTP2_TOKEN_WWW_AUTHENTICATE = 60,
-  NGHTTP2_TOKEN_ACCEPT_CH,
-  NGHTTP2_TOKEN_ACCEPT_DATETIME,
-  NGHTTP2_TOKEN_ACCEPT_FEATURES,
-  NGHTTP2_TOKEN_ACCEPT_PATCH,
-  NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_CREDENTIALS,
-  NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_HEADERS,
-  NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_METHODS,
-  NGHTTP2_TOKEN_ACCESS_CONTROL_EXPOSE_HEADERS,
-  NGHTTP2_TOKEN_ACCESS_CONTROL_MAX_AGE,
-  NGHTTP2_TOKEN_ACCESS_CONTROL_REQUEST_HEADERS,
-  NGHTTP2_TOKEN_ACCESS_CONTROL_REQUEST_METHOD,
-  NGHTTP2_TOKEN_ALT_SVC,
-  NGHTTP2_TOKEN_ALTERNATES,
-  NGHTTP2_TOKEN_CONNECTION,
-  NGHTTP2_TOKEN_CONTENT_MD5,
-  NGHTTP2_TOKEN_CONTENT_SECURITY_POLICY,
-  NGHTTP2_TOKEN_CONTENT_SECURITY_POLICY_REPORT_ONLY,
-  NGHTTP2_TOKEN_DNT,
-  NGHTTP2_TOKEN_FORWARDED,
-  NGHTTP2_TOKEN_FRONT_END_HTTPS,
-  NGHTTP2_TOKEN_KEEP_ALIVE,
-  NGHTTP2_TOKEN_LAST_EVENT_ID,
-  NGHTTP2_TOKEN_NEGOTIATE,
-  NGHTTP2_TOKEN_ORIGIN,
-  NGHTTP2_TOKEN_P3P,
-  NGHTTP2_TOKEN_PRAGMA,
-  NGHTTP2_TOKEN_PROXY_CONNECTION,
-  NGHTTP2_TOKEN_PUBLIC_KEY_PINS,
-  NGHTTP2_TOKEN_SEC_WEBSOCKET_EXTENSIONS,
-  NGHTTP2_TOKEN_SEC_WEBSOCKET_KEY,
-  NGHTTP2_TOKEN_SEC_WEBSOCKET_ORIGIN,
-  NGHTTP2_TOKEN_SEC_WEBSOCKET_PROTOCOL,
-  NGHTTP2_TOKEN_SEC_WEBSOCKET_VERSION,
-  NGHTTP2_TOKEN_SET_COOKIE2,
-  NGHTTP2_TOKEN_STATUS,
-  NGHTTP2_TOKEN_TCN,
   NGHTTP2_TOKEN_TE,
-  NGHTTP2_TOKEN_TRAILER,
+  NGHTTP2_TOKEN_CONNECTION,
-  NGHTTP2_TOKEN_TSV,
+  NGHTTP2_TOKEN_KEEP_ALIVE,
+  NGHTTP2_TOKEN_PROXY_CONNECTION,
   NGHTTP2_TOKEN_UPGRADE,
-  NGHTTP2_TOKEN_UPGRADE_INSECURE_REQUESTS,
-  NGHTTP2_TOKEN_VARIANT_VARY,
-  NGHTTP2_TOKEN_WARNING,
-  NGHTTP2_TOKEN_X_API_VERSION,
-  NGHTTP2_TOKEN_X_ATT_DEVICEID,
-  NGHTTP2_TOKEN_X_CACHE,
-  NGHTTP2_TOKEN_X_CACHE_LOOKUP,
-  NGHTTP2_TOKEN_X_CONTENT_DURATION,
-  NGHTTP2_TOKEN_X_CONTENT_SECURITY_POLICY,
-  NGHTTP2_TOKEN_X_CONTENT_TYPE_OPTIONS,
-  NGHTTP2_TOKEN_X_DNSPREFETCH_CONTROL,
-  NGHTTP2_TOKEN_X_FORWARDED_FOR,
-  NGHTTP2_TOKEN_X_FORWARDED_HOST,
-  NGHTTP2_TOKEN_X_FORWARDED_PROTO,
-  NGHTTP2_TOKEN_X_FRAME_OPTIONS,
-  NGHTTP2_TOKEN_X_POWERED_BY,
-  NGHTTP2_TOKEN_X_REQUESTED_WITH,
-  NGHTTP2_TOKEN_X_UA_COMPATIBLE,
-  NGHTTP2_TOKEN_X_WAP_PROFILE,
-  NGHTTP2_TOKEN_X_WEBKIT_CSP,
-  NGHTTP2_TOKEN_X_XSS_PROTECTION,
 } nghttp2_token;
 
 struct nghttp2_hd_entry;