Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-100474: Fix handling of dirs named index.html in http.server #100475

Merged
merged 6 commits into from
Dec 24, 2022
Merged

gh-100474: Fix handling of dirs named index.html in http.server #100475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43a1a0d
Fix handling of dirs named index.html in http.server
Fraetor Dec 23, 2022
b89b070
Add NEWS notice via blurb
Fraetor Dec 23, 2022
ee23e37
Add test for index.html dir for http.server
Fraetor Dec 23, 2022
92da3bf
Merge branch 'main' into http-server-dir-index-bugfix
merwok Dec 24, 2022
869d94a
Update Misc/NEWS.d/next/Library/2022-12-23-21-02-43.gh-issue-100474.g…
Fraetor Dec 24, 2022
ed9312d
Correct ReST syntax in NEWS file
Fraetor Dec 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/http/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions Lib/test/test_httpservers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
merwok marked this conversation as resolved.
Show resolved Hide resolved

data = b"Dummy index file\r\n"
with open(os.path.join(self.tempdir_name, 'index.html'), 'wb') as f:
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2022-12-23-21-02-43.gh-issue-100474.gppA4U.rst
View file
Open in desktop
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``.