RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-25 04:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: mux-h2: make use of hpack_encode_method() to encode the method

Browse Source 
The HTTP method encoding was open-coded with raw HPACK bytes, which is
not suitable there. Let's make use of the new functions to avoid this.
This commit is contained in:
Willy Tarreau 2018-12-10 18:25:11 +01:00
parent 39c80ebff0
commit bdabc3a25f
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mux_h2.c
View File

@ -4062,18 +4062,7 @@ static size_t h2s_htx_bck_make_req_headers(struct h2s *h2s, struct htx *htx)
outbuf.data = 9;
/* encode the method, which necessarily is the first one */
if (outbuf.data < outbuf.size && sl->info.req.meth == HTTP_METH_GET)
outbuf.area[outbuf.data++] = 0x82; // indexed field : idx[02]=(":method", "GET")
else if (outbuf.data < outbuf.size && sl->info.req.meth == HTTP_METH_POST)
outbuf.area[outbuf.data++] = 0x83; // indexed field : idx[03]=(":method", "POST")
else if (unlikely(outbuf.data + 2 + meth.len <= outbuf.size)) {
/* basic encoding of the method code */
outbuf.area[outbuf.data++] = 0x42; // indexed name -- name=":method" (idx 2)
outbuf.area[outbuf.data++] = meth.len; // method length
memcpy(&outbuf.area[outbuf.data], meth.ptr, meth.len);
outbuf.data += meth.len;
}
else {
if (!hpack_encode_method(&outbuf, sl->info.req.meth, meth)) {
if (b_space_wraps(&h2c->mbuf))
goto realign_again;
goto full;