Merge pull request #280 from ngtcp2/revert-264

Revert "Do huffman encoding only when the reduction is more than 25%"
ngtcp2 · Nov 23, 2024 · ca07550 · ca07550
2 parents 594e2b3 + 9942ce6
commit ca07550
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/nghttp3_qpack.c b/lib/nghttp3_qpack.c
@@ -1837,7 +1837,7 @@ static int qpack_encoder_write_indexed_name(nghttp3_qpack_encoder *encoder,
   int h = 0;
 
   hlen = nghttp3_qpack_huffman_encode_count(nv->value, nv->valuelen);
-  if (hlen * 4 < nv->valuelen * 3) {
+  if (hlen < nv->valuelen) {
     h = 1;
     len += nghttp3_qpack_put_varint_len(hlen, 7) + hlen;
   } else {
@@ -1928,15 +1928,15 @@ static int qpack_encoder_write_literal(nghttp3_qpack_encoder *encoder,
   int nh = 0, vh = 0;
 
   nhlen = nghttp3_qpack_huffman_encode_count(nv->name, nv->namelen);
-  if (nhlen * 4 < nv->namelen * 3) {
+  if (nhlen < nv->namelen) {
     nh = 1;
     len = nghttp3_qpack_put_varint_len(nhlen, prefix) + nhlen;
   } else {
     len = nghttp3_qpack_put_varint_len(nv->namelen, prefix) + nv->namelen;
   }
 
   vhlen = nghttp3_qpack_huffman_encode_count(nv->value, nv->valuelen);
-  if (vhlen * 4 < nv->valuelen * 3) {
+  if (vhlen < nv->valuelen) {
     vh = 1;
     len += nghttp3_qpack_put_varint_len(vhlen, 7) + vhlen;
   } else {