Ori.livneh has submitted this change and it was merged. Change subject: Omit request hostname and URI from Varnish error page ......................................................................
Omit request hostname and URI from Varnish error page Bug: T118129 Change-Id: Iaa3efabc8ea6e2977baa6165d915aa45b374b0e6 --- M templates/varnish/errorpage.inc.vcl.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/templates/varnish/errorpage.inc.vcl.erb b/templates/varnish/errorpage.inc.vcl.erb index c66c23c..6c10fc5 100644 --- a/templates/varnish/errorpage.inc.vcl.erb +++ b/templates/varnish/errorpage.inc.vcl.erb @@ -38,7 +38,7 @@ <div class="footer"> <p>If you report this error to the Wikimedia System Administrators, please include the details below.</p> <p class="text-muted"><code> -Request: "} + req.request + " http://"; + req.http.host + regsuball(req.url, "<", "%3C") + ", from " + client.ip + " via " + server.hostname + " " + server.identity + " ([" + server.ip + "]:" + server.port + "), Varnish XID " + req.xid + "<br>" + +Request from " + client.ip + " via " + server.hostname + " " + server.identity + " ([" + server.ip + "]:" + server.port + "), Varnish XID " + req.xid + "<br>" + regsub(req.http.X-Forwarded-For, ".+", "Forwarded for: \0<br>") + regsub(obj.http.X-Cache, ".+", "Upstream caches: \0<br>") + "Error: " + obj.status + ", " + obj.response + " at " + now + {" -- To view, visit https://gerrit.wikimedia.org/r/251832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa3efabc8ea6e2977baa6165d915aa45b374b0e6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
