[6.0] 23414442f Always report the ws id in lowercase

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Oct 31 13:08:22 UTC 2018


commit 23414442fd30becaf6db83b59627e55c9ce2ab7f
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
 


More information about the varnish-commit mailing list