Back-ports for 6.0.2

[dridi]

Akin to #2799, this is the proposed set of back-ports for 6.0.2 up to current master (f56cce5).

As usual the goal is to avoid breaking the VRT and libvarnishapi ABIs since it's a stable branch with one notable difference this time. Following consensus from #2800 we are breaking two VRT symbols without changing the VRT 7.0 version because those symbols should not be used by inline C or VMOD authors.

git diff varnish-6.0.1..HEAD -- include/vrt.h

And with no surprises:

diff --git a/include/vrt.h b/include/vrt.h
index 936aa207f..3db7c0438 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -423,9 +423,9 @@ int VRT_Healthy(VRT_CTX, VCL_BACKEND);
 int VRT_VSA_GetPtr(const struct suckaddr *sua, const unsigned char ** dst);
 
 /* VMOD/Modules related */
-int VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len,
+int VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, unsigned nbr, void *ptr, int len,
     const char *nm, const char *path, const char *file_id, const char *backup);
-void VRT_Vmod_Fini(struct vmod **hdl);
+void VRT_Vmod_Unload(VRT_CTX, struct vmod **hdl);
 
 /* VCL program related */
 VCL_VCL VRT_vcl_get(VRT_CTX, const char *);

Some of the original commits were partially back-ported because sometimes patches cover a wee bit more than what the commit messages say.

I believe not to have broken the libvarnishapi ABI, and the following changes were left out:

• the soname bump to 2.0.0
• the SessError SLT

That last one may be introduced since we have both a patch introducing it and another moving it to the last entry to preserve binary compatibility. Feedback appreciated.

Other notable changes that were left out:

• b51bc4a (for the lack of production feedback, already skipped for 6.0.1, can be revisited)
• vmod-blob changes not breaking the VCL API, but relying on post-7.0 VRT_CollectStrands
• anything VFP/VDP related
• 6.1 release notes
• debug.sethdr (because strands again)
• in general the type of changes that didn't make it in 6.0.1

Debatable changes that made it in:

• VSC groups
• WS fail counters
• libvgz ifdefing

I don't think they count as breaking changes. Feedback appreciated.

I found a couple nits in master, I will open separate tickets or fix them directly.

I didn't update the changelog, and according to git log and grep we should mention those tickets:

git log varnish-6.0.1..HEAD | egrep -i '(Fixes|Closes):? #' | sed 's/^\s*/- /'

• Fixes watchdog issues #2794
• Closes recheck object slimming (not a bug) #2768
• Closes Extend JSON support in the CLI #2783
• Fixes: net::ERR_CONNECTION_CLOSED on Chrome 69 #2775
• Fixes Assert error in WS_Assert(), cache/cache_ws.c line 59: #2589
• Fixes varnishstat -f regression #2787
• Fixes: -I option doesn't work anymore #2782
• Fixes: u00008.vtc systematic timeout #2668
• Fixes: varnishhist output not correctly in 6.0.1 and 6.1.0 #2780
• Fixes: varnishtest documentation for delay/feature/shell adding it back to 6.x #2777
• Fixes panic in vbf_stp_mkbereq(): Condition((bo->stale_oc->flags & OC_F_PASS) == 0) not true. #2763
• Fixes vmodtool fails on vcc file which already is UTF-8 encoded #2761
• Fixes: Fix and test objhead refcount for hit-for-pass #2760, high number of objects with hit-for-miss #2754, Overuse of Transient storage with hit-for-miss objects #2654
• Fixes: Allow to not have randomness in file_id #2436
• Fixes: b64.vtc unstable #2753
• Fixes missing NULL handling for VCC-generated VRT_priv_(task|top) arguments #2708
• Fixes: VCL_Poll ctx scope #2749
• Fixes obj.hits is always 0 in vcl_hit #2746
• Fixes need to communicate the reason if vcl_init fails in vcl passed at start time #2694
• Fixes Build-time dependency python-sphinx is not checked in configure.ac #2742

I will happily spam your inbox if this gets approved, and hope someone will take care of the changelog :)

Special thanks to @hermunn!