MINOR: htx: Don't try to append a trailer block with the previous one

In H1 and H2, one and only one trailer block is emitted during the HTTP
parsing. So it is useless to try to append this block with the previous one,
like for data block.

This patch may be backported to 1.9.

diff --git a/src/htx.c b/src/htx.c
index 62a175d9d4acbddbbe8c66e57c559ae5ff0cd506..25848d3d354d4dcc455b3a7058c01f22680e0503 100644 (file)
--- a/src/htx.c
+++ b/src/htx.c
@@ -345,10 +345,10 @@ struct htx_ret htx_drain(struct htx *htx, uint32_t count)
 }
 
 /* Tries to append data to the last inserted block, if the type matches and if
- * there is enough non-wrapping space. Only DATA and TRAILERS content can be
- * appended. If the append fails, a new block is inserted. If an error occurred,
- * NULL is returned. Otherwise, on success, the updated block (or the new one)
- * is returned.
+ * there is enough non-wrapping space. Only DATA content can be appended. If the
+ * append fails, a new block is inserted. If an error occurred, NULL is
+ * returned. Otherwise, on success, the updated block (or the new one) is
+ * returned.
 */
 static struct htx_blk *htx_append_blk_value(struct htx *htx, enum htx_blk_type type,
                                            const struct ist data)
@@ -364,8 +364,8 @@ static struct htx_blk *htx_append_blk_value(struct htx *htx, enum htx_blk_type t
        if (data.len > htx_free_data_space(htx))
                return NULL;
 
-       /* Append only DATA et TRAILERS data */
-       if (type != HTX_BLK_DATA && type != HTX_BLK_TLR)
+       /* Append only DATA */
+       if (type != HTX_BLK_DATA)
                goto add_new_block;
 
        /* get the tail and head block */
@@ -785,13 +785,21 @@ struct htx_blk *htx_add_data(struct htx *htx, const struct ist data)
        return htx_append_blk_value(htx, HTX_BLK_DATA, data);
 }
 
-/* Adds an HTX block of type TLR in <htx>. It first tries to append trailers
- * data if possible. It returns the new block on success. Otherwise, it returns
- * NULL.
+/* Adds an HTX block of type TLR in <htx>. It returns the new block on
+ * success. Otherwise, it returns NULL.
  */
 struct htx_blk *htx_add_trailer(struct htx *htx, const struct ist tlr)
 {
-       return htx_append_blk_value(htx, HTX_BLK_TLR, tlr);
+       struct htx_blk *blk;
+
+       /* FIXME: check tlr.len (< 256MB) */
+       blk = htx_add_blk(htx, HTX_BLK_TLR, tlr.len);
+       if (!blk)
+               return NULL;
+
+       blk->info += tlr.len;
+       memcpy(htx_get_blk_ptr(htx, blk), tlr.ptr, tlr.len);
+       return blk;
 }
 
 /* Adds an HTX block of type OOB in <htx>. It returns the new block on