diff options
| author | Pablo Polvorin <[email protected]> | 2016-10-06 17:19:36 -0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2016-10-09 00:29:29 +0200 |
| commit | bafd37c5968e684d63e61e68071b5e86ebfe7e9a (patch) | |
| tree | b293c7944f777c4dad40e92cbdd5aec49a8d83a3 /src/cow_hpack.erl | |
| parent | b7ae1f55199b8e7057e991874b6cafa065f159b0 (diff) | |
| download | cowlib-bafd37c5968e684d63e61e68071b5e86ebfe7e9a.tar.gz cowlib-bafd37c5968e684d63e61e68071b5e86ebfe7e9a.tar.bz2 cowlib-bafd37c5968e684d63e61e68071b5e86ebfe7e9a.zip | |
Fix HPACK table size tracking when table is pruned
The new entry size wasn't being added to the table size
after a prune.
Also fixes incorrect test cases. The size number was
different than the one found in RFC 7541 Appendix C.
Diffstat (limited to 'src/cow_hpack.erl')
| -rw-r--r-- | src/cow_hpack.erl | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/cow_hpack.erl b/src/cow_hpack.erl index e11b98b..a3c1c9b 100644 --- a/src/cow_hpack.erl +++ b/src/cow_hpack.erl @@ -523,7 +523,7 @@ resp_decode_test() -> {<<"date">>, <<"Mon, 21 Oct 2013 20:13:21 GMT">>}, {<<"location">>, <<"https://www.example.com">>} ], - #state{size=180, dyn_table=[ + #state{size=222, dyn_table=[ {42,{<<":status">>, <<"307">>}}, {63,{<<"location">>, <<"https://www.example.com">>}}, {65,{<<"date">>, <<"Mon, 21 Oct 2013 20:13:21 GMT">>}}, @@ -539,7 +539,7 @@ resp_decode_test() -> {<<"content-encoding">>, <<"gzip">>}, {<<"set-cookie">>, <<"foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1">>} ], - #state{size=117, dyn_table=[ + #state{size=215, dyn_table=[ {98,{<<"set-cookie">>, <<"foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1">>}}, {52,{<<"content-encoding">>, <<"gzip">>}}, {65,{<<"date">>, <<"Mon, 21 Oct 2013 20:13:22 GMT">>}}]} = State3, @@ -953,7 +953,7 @@ resp_encode_test() -> << 16#4803333037c1c0bf:64 >> = iolist_to_binary(Raw2), {Huff2, State2} = encode(Headers2, State1), << 16#4883640effc1c0bf:64 >> = iolist_to_binary(Huff2), - #state{size=180, dyn_table=[ + #state{size=222, dyn_table=[ {42,{<<":status">>, <<"307">>}}, {63,{<<"location">>, <<"https://www.example.com">>}}, {65,{<<"date">>, <<"Mon, 21 Oct 2013 20:13:21 GMT">>}}, @@ -971,7 +971,7 @@ resp_encode_test() -> << 16#88c1611d4d6f6e2c203231204f637420323031332032303a31333a323220474d54c05a04677a69707738666f6f3d4153444a4b48514b425a584f5157454f50495541585157454f49553b206d61782d6167653d333630303b2076657273696f6e3d31:784 >> = iolist_to_binary(Raw3), {Huff3, State3} = encode(Headers3, State2), << 16#88c16196d07abe941054d444a8200595040b8166e084a62d1bffc05a839bd9ab77ad94e7821dd7f2e6c7b335dfdfcd5b3960d5af27087f3672c1ab270fb5291f9587316065c003ed4ee5b1063d5007:632 >> = iolist_to_binary(Huff3), - #state{size=117, dyn_table=[ + #state{size=215, dyn_table=[ {98,{<<"set-cookie">>, <<"foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1">>}}, {52,{<<"content-encoding">>, <<"gzip">>}}, {65,{<<"date">>, <<"Mon, 21 Oct 2013 20:13:22 GMT">>}}]} = State3, @@ -1264,14 +1264,13 @@ table_get_name(Index, #state{dyn_table=DynamicTable}) -> table_insert(Entry = {Name, Value}, State=#state{size=Size, max_size=MaxSize, dyn_table=DynamicTable}) -> EntrySize = byte_size(Name) + byte_size(Value) + 32, - Size2 = Size + EntrySize, - {DynamicTable2, Size3} = if + {DynamicTable2, Size2} = if Size + EntrySize > MaxSize -> table_resize(DynamicTable, MaxSize - EntrySize, 0, []); true -> - {DynamicTable, Size2} + {DynamicTable, Size} end, - State#state{size=Size3, dyn_table=[{EntrySize, Entry}|DynamicTable2]}. + State#state{size=Size2 + EntrySize, dyn_table=[{EntrySize, Entry}|DynamicTable2]}. table_resize([], _, Size, Acc) -> {lists:reverse(Acc), Size}; |