mirror of https://github.com/zulip/zulip.git
middleware: Remove ZulipCommonMiddleware patch.
My fix for the relevant performance bug was upstreamed in Django 4.2. https://code.djangoproject.com/ticket/33700 Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
parent
95f2ead33d
commit
d2af06f4df
|
@ -11,7 +11,6 @@ from django.conf.urls.i18n import is_language_prefix_patterns_used
|
|||
from django.db import connection
|
||||
from django.http import HttpRequest, HttpResponse, HttpResponseRedirect, StreamingHttpResponse
|
||||
from django.http.response import HttpResponseBase
|
||||
from django.middleware.common import CommonMiddleware
|
||||
from django.middleware.locale import LocaleMiddleware as DjangoLocaleMiddleware
|
||||
from django.shortcuts import render
|
||||
from django.utils import translation
|
||||
|
@ -687,28 +686,6 @@ class FinalizeOpenGraphDescription(MiddlewareMixin):
|
|||
return response
|
||||
|
||||
|
||||
class ZulipCommonMiddleware(CommonMiddleware):
|
||||
"""
|
||||
Patched version of CommonMiddleware to disable the APPEND_SLASH
|
||||
redirect behavior inside Tornado.
|
||||
|
||||
While this has some correctness benefit in encouraging clients
|
||||
to implement the API correctly, this also saves about 600us in
|
||||
the runtime of every GET /events query, as the APPEND_SLASH
|
||||
route resolution logic is surprisingly expensive.
|
||||
|
||||
TODO: We should probably extend this behavior to apply to all of
|
||||
our API routes. The APPEND_SLASH behavior is really only useful
|
||||
for non-API endpoints things like /login. But doing that
|
||||
transition will require more careful testing.
|
||||
"""
|
||||
|
||||
def should_redirect_with_slash(self, request: HttpRequest) -> bool:
|
||||
if settings.RUNNING_INSIDE_TORNADO:
|
||||
return False
|
||||
return super().should_redirect_with_slash(request)
|
||||
|
||||
|
||||
def validate_scim_bearer_token(request: HttpRequest) -> bool:
|
||||
"""
|
||||
This function verifies the request is allowed to make SCIM requests on this subdomain,
|
||||
|
|
|
@ -174,7 +174,7 @@ MIDDLEWARE = (
|
|||
"zerver.middleware.JsonErrorHandler",
|
||||
"zerver.middleware.RateLimitMiddleware",
|
||||
"zerver.middleware.FlushDisplayRecipientCache",
|
||||
"zerver.middleware.ZulipCommonMiddleware",
|
||||
"django.middleware.common.CommonMiddleware",
|
||||
"zerver.middleware.LocaleMiddleware",
|
||||
"zerver.middleware.HostDomainMiddleware",
|
||||
"django.middleware.csrf.CsrfViewMiddleware",
|
||||
|
|
Loading…
Reference in New Issue