walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'weliu-master'

This commit is contained in:
Tatsuhiro Tsujikawa 2016-08-06 22:44:10 +09:00
parent ad3d43b8be e7e3d77c53
commit 862175b21c
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
genlibtokenlookup.py
View File

@ -88,7 +88,8 @@ def build_header(headers):
c = k[-1] c = k[-1]
if c not in ent: if c not in ent:
ent[c] = [] ent[c] = []
ent[c].append(k) if k not in ent[c]:
ent[c].append(k)
return res return res
@ -106,7 +107,7 @@ def gen_enum():
def gen_index_header(): def gen_index_header():
print '''\ print '''\
static inline int32_t lookup_token(const uint8_t *name, size_t namelen) { static int32_t lookup_token(const uint8_t *name, size_t namelen) {
switch (namelen) {''' switch (namelen) {'''
b = build_header(HEADERS) b = build_header(HEADERS)
for size in sorted(b.keys()): for size in sorted(b.keys()):

27
lib/nghttp2_hd.c
View File

@ -183,9 +183,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
} }
break; break;
case 'h': case 'h':
if (lstreq(":pat", name, 4)) {
return NGHTTP2_TOKEN__PATH;
}
if (lstreq(":pat", name, 4)) { if (lstreq(":pat", name, 4)) {
return NGHTTP2_TOKEN__PATH; return NGHTTP2_TOKEN__PATH;
} }
@ -222,17 +219,11 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
case 7: case 7:
switch (name[6]) { switch (name[6]) {
case 'd': case 'd':
if (lstreq(":metho", name, 6)) {
return NGHTTP2_TOKEN__METHOD;
}
if (lstreq(":metho", name, 6)) { if (lstreq(":metho", name, 6)) {
return NGHTTP2_TOKEN__METHOD; return NGHTTP2_TOKEN__METHOD;
} }
break; break;
case 'e': case 'e':
if (lstreq(":schem", name, 6)) {
return NGHTTP2_TOKEN__SCHEME;
}
if (lstreq(":schem", name, 6)) { if (lstreq(":schem", name, 6)) {
return NGHTTP2_TOKEN__SCHEME; return NGHTTP2_TOKEN__SCHEME;
} }
@ -251,24 +242,6 @@ static int32_t lookup_token(const uint8_t *name, size_t namelen) {
} }
break; break;
case 's': case 's':
if (lstreq(":statu", name, 6)) {
return NGHTTP2_TOKEN__STATUS;
}
if (lstreq(":statu", name, 6)) {
return NGHTTP2_TOKEN__STATUS;
}
if (lstreq(":statu", name, 6)) {
return NGHTTP2_TOKEN__STATUS;
}
if (lstreq(":statu", name, 6)) {
return NGHTTP2_TOKEN__STATUS;
}
if (lstreq(":statu", name, 6)) {
return NGHTTP2_TOKEN__STATUS;
}
if (lstreq(":statu", name, 6)) {
return NGHTTP2_TOKEN__STATUS;
}
if (lstreq(":statu", name, 6)) { if (lstreq(":statu", name, 6)) {
return NGHTTP2_TOKEN__STATUS; return NGHTTP2_TOKEN__STATUS;
} }