I have reimplemented this based on Nils's #2858, because I found
it too complex and intrusive.  (In particular we try to avoid
unions in Varnish).

Testcase m00051 by:	Nils Goroll

Closes:	#2858