python · miss-islington · Dec 24, 2022 · Dec 23, 2022 · Dec 23, 2022 · Dec 23, 2022
diff --git a/Lib/http/server.py b/Lib/http/server.py
@@ -711,7 +711,7 @@ def send_head(self):
                 return None
             for index in self.index_pages:
                 index = os.path.join(path, index)
-                if os.path.exists(index):
+                if os.path.isfile(index):
                     path = index
                     break
             else:

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
@@ -489,6 +489,9 @@ def test_get(self):
         self.check_status_and_reason(response, HTTPStatus.NOT_FOUND)
         response = self.request('/' + 'ThisDoesNotExist' + '/')
         self.check_status_and_reason(response, HTTPStatus.NOT_FOUND)
+        os.makedirs(os.path.join(self.tempdir, 'spam', 'index.html'))
+        response = self.request(self.base_url + '/spam/')
+        self.check_status_and_reason(response, HTTPStatus.OK)
 
         data = b"Dummy index file\r\n"
         with open(os.path.join(self.tempdir_name, 'index.html'), 'wb') as f:

diff --git a/Misc/NEWS.d/next/Library/2022-12-23-21-02-43.gh-issue-100474.gppA4U.rst b/Misc/NEWS.d/next/Library/2022-12-23-21-02-43.gh-issue-100474.gppA4U.rst
@@ -0,0 +1,2 @@
+:mod:`http.server` now checks that an index page is actually a regular file before trying
+to serve it.  This avoids issues with directories named ``index.html``.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		:mod:`http.server` now checks that an index page is actually a regular file before trying
		to serve it. This avoids issues with directories named ``index.html``.