diff options
| author | Anders Kaseorg <andersk@mit.edu> | 2022-06-02 12:34:41 +0200 |
|---|---|---|
| committer | Carlton Gibson <carlton@noumenal.es> | 2022-06-02 15:15:04 +0200 |
| commit | fbac2a4dd846b52c4f379eacb5bab654fe9540cc (patch) | |
| tree | 3868c64f08b50d18219fc8050c1cf7bf64a2c682 /tests/middleware/tests.py | |
| parent | 798b6c23ee52c675dd0f0e233c50cddd7ff15657 (diff) | |
Fixed #33700 -- Skipped extra resolution for successful requests not ending with /.
By moving a should_redirect_with_slash call out of an if block, commit
9390da7fb6e251eaa9a785692f987296cb14523f negated the performance fix
of commit 434d309ef6dbecbfd2b322d3a1da78aa5cb05fa8 (#24720).
Meanwhile, the logging issue #26293 that it targeted was subsequently
fixed more fully by commit 40b69607c751c4afa453edfd41d2ed155e58187e
(#26504), so it is no longer needed. This effectively reverts it.
This speeds up successful requests not ending with / when APPEND_SLASH
is enabled (the default, and still useful in projects with a mix of
URLs with and without trailing /). The amount of speedup varies from
about 5% in a typical project to nearly 50% on a benchmark with many
routes.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'tests/middleware/tests.py')
| -rw-r--r-- | tests/middleware/tests.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py index cb40b36321..63eaa5d28f 100644 --- a/tests/middleware/tests.py +++ b/tests/middleware/tests.py @@ -80,7 +80,11 @@ class CommonMiddlewareTest(SimpleTestCase): """ request = self.rf.get("/slash") r = CommonMiddleware(get_response_empty).process_request(request) + self.assertIsNone(r) + response = HttpResponseNotFound() + r = CommonMiddleware(get_response_empty).process_response(request, response) self.assertEqual(r.status_code, 301) + self.assertEqual(r.url, "/slash/") @override_settings(APPEND_SLASH=True) def test_append_slash_redirect_querystring(self): @@ -164,6 +168,9 @@ class CommonMiddlewareTest(SimpleTestCase): # Use 4 slashes because of RequestFactory behavior. request = self.rf.get("////evil.com/security") r = CommonMiddleware(get_response_404).process_request(request) + self.assertIsNone(r) + response = HttpResponseNotFound() + r = CommonMiddleware(get_response_404).process_response(request, response) self.assertEqual(r.status_code, 301) self.assertEqual(r.url, "/%2Fevil.com/security/") r = CommonMiddleware(get_response_404)(request) @@ -354,6 +361,9 @@ class CommonMiddlewareTest(SimpleTestCase): request = self.rf.get("/slash") request.META["QUERY_STRING"] = "drink=café" r = CommonMiddleware(get_response_empty).process_request(request) + self.assertIsNone(r) + response = HttpResponseNotFound() + r = CommonMiddleware(get_response_empty).process_response(request, response) self.assertEqual(r.status_code, 301) def test_response_redirect_class(self): |