[master] 4e8926cc5 Always report the ws id in lowercase
Nils Goroll
nils.goroll at uplex.de
Wed Sep 26 05:42:59 UTC 2018
Hi Federico,
can you explain why this is a good idea? Isn't the overflow maker relevant in
panics?
Nils
On 25/09/2018 00:48, Federico G. Schwindt wrote:
>
> commit 4e8926cc58e0376e7ee4115f9091dacd595b98c0
> Author: Federico G. Schwindt <fgsch at lodoss.net>
> Date: Mon Sep 24 23:44:13 2018 +0100
>
> Always report the ws id in lowercase
>
> diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
> index 2e61ca7cf..30988ab56 100644
> --- a/bin/varnishd/cache/cache_http.c
> +++ b/bin/varnishd/cache/cache_http.c
> @@ -102,6 +102,7 @@ http_fail(const struct http *hp)
> {
>
> VSC_C_main->losthdr++;
> + hp->ws->id[0] |= 0x20; // cheesy tolower()
> VSLb(hp->vsl, SLT_Error, "out of workspace (%s)", hp->ws->id);
> WS_MarkOverflow(hp->ws);
> }
> diff --git a/bin/varnishtest/tests/r01739.vtc b/bin/varnishtest/tests/r01739.vtc
> index 7b8d6565d..843ea6933 100644
> --- a/bin/varnishtest/tests/r01739.vtc
> +++ b/bin/varnishtest/tests/r01739.vtc
> @@ -17,7 +17,7 @@ varnish v1 -vcl+backend {
>
> logexpect l1 -v v1 -g raw {
> expect * 1002 FetchError {^Workspace overflow}
> - expect * = Error {^out of workspace [(]Bo[)]}
> + expect * = Error {^out of workspace [(]bo[)]}
> } -start
>
> client c1 {
> diff --git a/bin/varnishtest/tests/r01990.vtc b/bin/varnishtest/tests/r01990.vtc
> index 5ee40bda5..d86f61c55 100644
> --- a/bin/varnishtest/tests/r01990.vtc
> +++ b/bin/varnishtest/tests/r01990.vtc
> @@ -26,9 +26,9 @@ logexpect l1 -v v1 -g raw {
> expect * 1002 FetchError {^out of workspace}
> expect * = BerespStatus {^503}
> expect * = BerespReason {^Backend fetch failed}
> - expect * = Error {^out of workspace [(]Bo[)]}
> + expect * = Error {^out of workspace [(]bo[)]}
> expect * = LostHeader {^Date:}
> - expect * = Error {^out of workspace [(]Bo[)]}
> + expect * = Error {^out of workspace [(]bo[)]}
> expect * = LostHeader {^299}
> } -start
>
> _______________________________________________
> varnish-commit mailing list
> varnish-commit at varnish-cache.org
> https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
>
--
** * * UPLEX - Nils Goroll Systemoptimierung
Scheffelstraße 32
22301 Hamburg
tel +49 40 28805731
mob +49 170 2723133
fax +49 40 42949753
xmpp://slink@jabber.int.uplex.de/
http://uplex.de/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20180926/fbd22229/attachment.bin>
More information about the varnish-commit
mailing list