Update copied-in code to reflect VXID changes

src/set.c

@@ -887,16 +887,16 @@ vmod_set_saved(VRT_CTX, struct vmod_re2_set *set, VCL_ENUM whichs, VCL_INT n,
 static void
 http_VSLH_del(const struct http *hp, unsigned hdr)
 {
-        int i;
-
-        if (hp->vsl != NULL) {
-                /* We don't support unsetting stuff in the first line */
-                assert (hdr >= HTTP_HDR_FIRST);
-                AN(hp->vsl->wid & (VSL_CLIENTMARKER|VSL_BACKENDMARKER));
-                i = (HTTP_HDR_UNSET - HTTP_HDR_METHOD);
-                i += hp->logtag;
-                VSLbt(hp->vsl, (enum VSL_tag_e)i, hp->hd[hdr]);
-        }
+	int i;
+
+	if (hp->vsl != NULL) {
+		/* We don't support unsetting stuff in the first line */
+		assert (hdr >= HTTP_HDR_FIRST);
+		assert(VXID_TAG(hp->vsl->wid));
+		i = (HTTP_HDR_UNSET - HTTP_HDR_METHOD);
+		i += hp->logtag;
+		VSLbt(hp->vsl, (enum VSL_tag_e)i, hp->hd[hdr]);
+	}
 }
 
 VCL_VOID