upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-25 16:17:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

BUG/MINOR: h2: use the H2_F_DATA_* macros for DATA frames

Browse source 
A typo resulted in H2_F_HEADERS_* being used there, but it's harmless
as they are equal. Better fix the confusion though.

Should be backported to 1.8.
This commit is contained in:
Willy Tarreau 2017-12-03 21:06:59 +01:00
parent 637f64d565
commit 7912781a30
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mux_h2.c
View file

@ -2617,7 +2617,7 @@ static int h2_frt_transfer_data(struct h2s *h2s, struct buffer *buf, int count)
/* The padlen is the first byte before data, and the padding appears
* after data. padlen+data+padding are included in flen.
*/
if (h2c->dff & H2_F_HEADERS_PADDED) {
if (h2c->dff & H2_F_DATA_PADDED) {
padlen = *(uint8_t *)bi_ptr(h2c->dbuf);
if (padlen >= flen) {
/* RFC7540#6.1 : pad length = length of frame payload or greater */
@ -2660,7 +2660,7 @@ static int h2_frt_transfer_data(struct h2s *h2s, struct buffer *buf, int count)
* FIXME: should we instead try to send it much later, after the
* response ? This would require that we keep a copy of it in h2s.
*/
if (h2c->dff & H2_F_HEADERS_END_STREAM) {
if (h2c->dff & H2_F_DATA_END_STREAM) {
h2s->cs->flags |= CS_FL_EOS;
h2s->flags |= H2_SF_ES_RCVD;
}