diff --git a/web/vibe/web/i18n.d b/web/vibe/web/i18n.d index f3403ef28..6227b7dc5 100644 --- a/web/vibe/web/i18n.d +++ b/web/vibe/web/i18n.d @@ -341,7 +341,7 @@ package string determineLanguage(alias METHOD)(scope HTTPServerRequest req) unittest { // make sure that the custom determineLanguage is called static struct CTX { - static string determineLanguage(Object a) { return "test"; } + static string determineLanguage(HTTPServerRequest a) { return "test"; } } @translationContext!CTX static class Test { @@ -350,7 +350,7 @@ unittest { // make sure that the custom determineLanguage is called } } auto test = new Test; - assert(determineLanguage!(test.test)(null) == "test"); + assert(determineLanguage!(test.test)(HTTPServerRequest.init) == "test"); } unittest { // issue #1955 diff --git a/web/vibe/web/web.d b/web/vibe/web/web.d index 9bd00cfe3..7503f7148 100644 --- a/web/vibe/web/web.d +++ b/web/vibe/web/web.d @@ -891,7 +891,7 @@ private struct RequestContext { private RequestContext getRequestContext() @trusted nothrow { - assert(s_requestContext.req !is null, "Request context used outside of a web interface request!"); + assert(s_requestContext.req !is HTTPServerRequest.init, "Request context used outside of a web interface request!"); return s_requestContext; }