avoid the magic pointer for gzip headers, use T_CRC

src/node.c

@@ -558,6 +558,13 @@ push_subreq(struct req *req, struct bytes_tree *tree,
 	return (tree->retval);
 }
 
+static const uint8_t gzip_hdr[] = {
+	0x1f, 0x8b, 0x08,
+	0x00, 0x00, 0x00, 0x00,
+	0x00,
+	0x02, 0x03
+};
+
 static void
 gzip_tailbuf(uint8_t tailbuf[GZIP_TAILBUF_SZ], struct nexus_gzip *gz)
 {
@@ -596,6 +603,9 @@ push_crc(struct req *req, struct bytes_tree *tree,
 	AN(nex->nexus.gzip.is);
 
 	switch(node->crc.ctype) {
+	case GZIP_HDR:
+		return (VDP_bytes(nex->nexus.req,
+		    VDP_NULL, gzip_hdr, sizeof gzip_hdr));
 	case UPDATE:
 		nex->nexus.gzip.crc = crc32_combine(
 			nex->nexus.gzip.crc, node->crc.icrc,

src/node.h

@@ -119,6 +119,7 @@ struct node_nexus {
 
 enum t_crc {
 	INVALID = 0,
+	GZIP_HDR,
 	UPDATE,
 	FINAL	// combine with parent or gen tail
 };

src/vdp_pesi.c

@@ -76,13 +76,6 @@ int block_final = 0;
  */
 int front_push = 0;
 
-static const uint8_t gzip_hdr[] = {
-	0x1f, 0x8b, 0x08,
-	0x00, 0x00, 0x00, 0x00,
-	0x00,
-	0x02, 0x03
-};
-
 /* Forward declarations */
 const struct vdp VDP_pesi_buf;
 static const struct transport VPED_transport;
@@ -536,9 +529,7 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv,
 	/*
 	 * non-api knowledge from VDP_DeliverObj()
 	 *  final = req->objcore->flags & (OC_F_PRIVATE | OC_F_HFM | OC_F_HFP);
-	 */
-
-	/*
+	 *
 	 * if data is coming from a varnish-cache simple storage, we know that
 	 * - for non-final objects
 	 * - as long as we keep a reference
@@ -556,11 +547,7 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv,
 		HSH_Ref(parent->nexus.oc);
 	}
 
-	// XXX make gzip_hdr a T_CRC ?
-	refok = ((parent->nexus.oc != NULL) ||
-		 // from vdp_pesi_bytes
-		 (ptr == gzip_hdr));
-
+	refok = (parent->nexus.oc != NULL);
 
 	AN(ptr);
 	AZ(node->data.ptr);
@@ -903,14 +890,16 @@ vdp_pesi_bytes(struct req *req, enum vdp_action act, void **priv,
 			pecx->e = pecx->p + l;
 
 			if (*pecx->p == VEC_GZ) {
-				/*
-				 * this will, in pesi_buf_bytes(), create a
-				 * T_DATA node which ref's gzip_hdr. Should we
-				 * rather add a T_GZIPHDR node?
-				 */
-				if (parent_gzip == NULL)
-					retval = VDP_bytes(req, VDP_NULL,
-							   gzip_hdr, 10);
+				if (parent_gzip == NULL) {
+					AZ(child);
+					child = node_alloc();
+					CHECK_OBJ_NOTNULL(child, NODE_MAGIC);
+					child->type = T_CRC;
+					child->state = ST_DATA;
+					child->crc.ctype = GZIP_HDR;
+					node_insert(tree, node, child);
+					child = NULL;
+				}
 				node->nexus.gzip.is = 1;
 				node->nexus.gzip.crc = crc32(0L, Z_NULL, 0);
 				AZ(node->nexus.gzip.l_crc);