[3.2.x] Fixed #32754 -- Made AdminSite.catch_all_view() respect SCRIPT_NAME.

Regression in ba31b0103442ac891fb3cb98f316781254e366c3.

Backport of f7691d4812c578e696635718e67639d2e08eac40 from main

1 files changed, 2 insertions, 3 deletions

diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
index 728e1cbf5e..3d9492e198 100644
--- a/django/contrib/admin/sites.py
+++ b/django/contrib/admin/sites.py
@@ -420,14 +420,13 @@ class AdminSite:
     def catch_all_view(self, request, url):
         if settings.APPEND_SLASH and not url.endswith('/'):
             urlconf = getattr(request, 'urlconf', None)
-            path = '%s/' % request.path_info
             try:
-                match = resolve(path, urlconf)
+                match = resolve('%s/' % request.path_info, urlconf)
             except Resolver404:
                 pass
             else:
                 if getattr(match.func, 'should_append_slash', True):
-                    return HttpResponsePermanentRedirect(path)
+                    return HttpResponsePermanentRedirect('%s/' % request.path)
         raise Http404
 
     def _build_app_dict(self, request, label=None):