Commit 02a8578d authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Be consistent about upper/lower VTLA

parent b1ce7022
......@@ -273,14 +273,14 @@ vfp_esi_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
vfe->priv1 = NULL;
}
const struct vfp vfp_esi = {
const struct vfp VFP_esi = {
.name = "esi",
.init = vfp_esi_init,
.pull = vfp_esi_pull,
.fini = vfp_esi_fini,
};
const struct vfp vfp_esi_gzip = {
const struct vfp VFP_esi_gzip = {
.name = "esi_gzip",
.init = vfp_esi_gzip_init,
.pull = vfp_esi_gzip_pull,
......
......@@ -574,19 +574,19 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
assert(bo->do_gzip == 0 || bo->do_gunzip == 0);
if (bo->do_gunzip || (bo->is_gzip && bo->do_esi))
vbf_vfp_push(bo, &vfp_gunzip);
vbf_vfp_push(bo, &VFP_gunzip);
if (bo->htc->content_length != 0) {
if (bo->do_esi && bo->do_gzip) {
vbf_vfp_push(bo, &vfp_esi_gzip);
vbf_vfp_push(bo, &VFP_esi_gzip);
} else if (bo->do_esi && bo->is_gzip && !bo->do_gunzip) {
vbf_vfp_push(bo, &vfp_esi_gzip);
vbf_vfp_push(bo, &VFP_esi_gzip);
} else if (bo->do_esi) {
vbf_vfp_push(bo, &vfp_esi);
vbf_vfp_push(bo, &VFP_esi);
} else if (bo->do_gzip) {
vbf_vfp_push(bo, &vfp_gzip);
vbf_vfp_push(bo, &VFP_gzip);
} else if (bo->is_gzip && !bo->do_gunzip) {
vbf_vfp_push(bo, &vfp_testgunzip);
vbf_vfp_push(bo, &VFP_testgunzip);
}
}
......
......@@ -664,7 +664,7 @@ vfp_gzip_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
/*--------------------------------------------------------------------*/
const struct vfp vfp_gunzip = {
const struct vfp VFP_gunzip = {
.name = "gunzip",
.init = vfp_gzip_init,
.pull = vfp_gunzip_pull,
......@@ -673,7 +673,7 @@ const struct vfp vfp_gunzip = {
.priv2 = VFP_GUNZIP,
};
const struct vfp vfp_gzip = {
const struct vfp VFP_gzip = {
.name = "gzip",
.init = vfp_gzip_init,
.pull = vfp_gzip_pull,
......@@ -682,7 +682,7 @@ const struct vfp vfp_gzip = {
.priv2 = VFP_GZIP,
};
const struct vfp vfp_testgunzip = {
const struct vfp VFP_testgunzip = {
.name = "testgunzip",
.init = vfp_gzip_init,
.pull = vfp_testgunzip_pull,
......
......@@ -93,11 +93,11 @@ void VFP_Setup(struct vfp_ctx *vc);
int VFP_Open(struct vfp_ctx *bo);
void VFP_Close(struct vfp_ctx *bo);
extern const struct vfp vfp_gunzip;
extern const struct vfp vfp_gzip;
extern const struct vfp vfp_testgunzip;
extern const struct vfp vfp_esi;
extern const struct vfp vfp_esi_gzip;
extern const struct vfp VFP_gunzip;
extern const struct vfp VFP_gzip;
extern const struct vfp VFP_testgunzip;
extern const struct vfp VFP_esi;
extern const struct vfp VFP_esi_gzip;
/* cache_http.c */
void HTTP_Init(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment