[6.0] 346475f45 Revert "Rename the obj flag OF_CHGGZIP to OF_CHGCE, for "changed Content-Encoding"."
Reza Naghibi
reza at naghibi.com
Tue Aug 18 17:45:07 UTC 2020
commit 346475f4560921efe88c4341b80b21f0b7b8b834
Author: Reza Naghibi <reza at naghibi.com>
Date: Tue Aug 18 13:33:54 2020 -0400
Revert "Rename the obj flag OF_CHGGZIP to OF_CHGCE, for "changed Content-Encoding"."
This reverts commit b90509232e5668aa79332749d0593718077f50ae.
Conflicts:
bin/varnishd/cache/cache_esi_fetch.c
bin/varnishd/cache/cache_fetch.c
diff --git a/bin/varnishd/cache/cache_esi_fetch.c b/bin/varnishd/cache/cache_esi_fetch.c
index 575685603..d8383afa7 100644
--- a/bin/varnishd/cache/cache_esi_fetch.c
+++ b/bin/varnishd/cache/cache_esi_fetch.c
@@ -163,7 +163,7 @@ vfp_esi_gzip_init(struct vfp_ctx *vc, struct vfp_entry *vfe)
ALLOC_OBJ(vef, VEF_MAGIC);
if (vef == NULL)
return (VFP_ERROR);
- vc->obj_flags |= OF_GZIPED | OF_CHGCE | OF_ESIPROC;
+ vc->obj_flags |= OF_GZIPED | OF_CHGGZIP | OF_ESIPROC;
vef->vep = VEP_Init(vc, vc->req, vfp_vep_callback, vef);
if (vef->vep == NULL) {
FREE_OBJ(vef);
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 840120b06..0d794c836 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -291,7 +291,7 @@ vbf_304_logic(struct busyobj *bo)
if (bo->stale_oc != NULL &&
ObjCheckFlag(bo->wrk, bo->stale_oc, OF_IMSCAND)) {
AZ(bo->stale_oc->flags & (OC_F_HFM|OC_F_PRIVATE));
- if (ObjCheckFlag(bo->wrk, bo->stale_oc, OF_CHGCE)) {
+ if (ObjCheckFlag(bo->wrk, bo->stale_oc, OF_CHGGZIP)) {
/*
* If a VFP changed C-E in the stored
* object, then don't overwrite C-E from
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index 390c9bae9..b325e79c5 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -466,14 +466,14 @@ vfp_gzip_init(struct vfp_ctx *vc, struct vfp_entry *vfe)
if (http_GetHdr(vc->resp, H_Content_Encoding, NULL))
return (VFP_NULL);
vg = VGZ_NewGzip(vc->wrk->vsl, vfe->vfp->priv1);
- vc->obj_flags |= OF_GZIPED | OF_CHGCE;
+ vc->obj_flags |= OF_GZIPED | OF_CHGGZIP;
} else {
if (!http_HdrIs(vc->resp, H_Content_Encoding, "gzip"))
return (VFP_NULL);
if (vfe->vfp == &VFP_gunzip) {
vg = VGZ_NewGunzip(vc->wrk->vsl, vfe->vfp->priv1);
vc->obj_flags &= ~OF_GZIPED;
- vc->obj_flags |= OF_CHGCE;
+ vc->obj_flags |= OF_CHGGZIP;
} else {
vg = VGZ_NewTestGunzip(vc->wrk->vsl, vfe->vfp->priv1);
vc->obj_flags |= OF_GZIPED;
diff --git a/include/tbl/obj_attr.h b/include/tbl/obj_attr.h
index a695c1efa..b0b6773e1 100644
--- a/include/tbl/obj_attr.h
+++ b/include/tbl/obj_attr.h
@@ -55,7 +55,7 @@
#ifdef OBJ_FLAG
/* upper, lower, val */
OBJ_FLAG(GZIPED, gziped, (1<<1))
- OBJ_FLAG(CHGCE, chgce, (1<<2))
+ OBJ_FLAG(CHGGZIP, chggzip, (1<<2))
OBJ_FLAG(IMSCAND, imscand, (1<<3))
OBJ_FLAG(ESIPROC, esiproc, (1<<4))
#undef OBJ_FLAG
More information about the varnish-commit
mailing list