--- a/mercurial/hgweb/wsgicgi.py	Wed Sep 06 18:12:27 2023 +0200
+++ b/mercurial/hgweb/wsgicgi.py	Fri Sep 08 20:34:41 2023 +0200
@@ -9,9 +9,7 @@
 # http://www.python.org/dev/peps/pep-0333/#the-server-gateway-side
 
 
-import os
-
-from .. import pycompat
+from .. import encoding, pycompat
 
 from ..utils import procutil
 
@@ -22,7 +20,10 @@
     procutil.setbinary(procutil.stdin)
     procutil.setbinary(procutil.stdout)
 
-    environ = dict(os.environ.items())  # re-exports
+    environ = {
+        k.decode('iso8859-1'): v.decode('iso8859-1')
+        for k, v in encoding.environ.items()
+    }  # re-exports
     environ.setdefault('PATH_INFO', '')
     if environ.get('SERVER_SOFTWARE', '').startswith('Microsoft-IIS'):
         # IIS includes script_name in PATH_INFO