Skip to content

Commit 8b84be2

Browse files
committed
Update docs
1 parent 3daf484 commit 8b84be2

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

Doc/whatsnew/3.14.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,8 +600,9 @@ http
600600
(Contributed by Yorik Hansen in :gh:`123430`.)
601601

602602
* The :mod:`http.server` module now supports serving over HTTPS using the
603-
new :class:`http.server.HTTPSServer`. Furthermore, the following command-line
604-
options have been added to ``python -m http.server``:
603+
new :class:`http.server.HTTPSServer`. This functionality is exposed by
604+
the command-line interface (``python -m http.server``) through the following
605+
options:
605606

606607
* ``--tls-cert <path>``: Path to the TLS certificate file.
607608
* ``--tls-key <path>``: Optional path to the private key file.

Lib/test/test_httpservers.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ def create_https_server(
6161
*,
6262
address=('localhost', 0),
6363
request_handler=DummyRequestHandler,
64-
6564
):
6665
return HTTPSServer(
6766
address, request_handler,
@@ -415,6 +414,10 @@ def test_invalid_certdata(self):
415414
(self.ONLYKEY, None, None),
416415
(self.ONLYKEY, self.ONLYCERT, None),
417416
(self.CERTFILE_PROTECTED, None, self.BADPASSWORD),
417+
# TODO: test the next case and add same case to test_ssl (We
418+
# specify a cert and a password-protected file, but no password):
419+
# (self.CERTFILE_PROTECTED, None, None),
420+
# see issue #132102
418421
]
419422
for certfile, keyfile, password in invalid_certdata:
420423
with self.subTest(
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The :mod:`http.server` module now includes built-in support for HTTPS
2-
servers exposed by :class:`http.server.HTTPSServer`. In addition, the
3-
``--tls-cert``, ``--tls-key`` and ``--tls-password-file`` command-line
4-
arguments have been added to the ``python -m http.server``.
2+
servers exposed by :class:`http.server.HTTPSServer`. This functionality
3+
is exposed by the command-line interface (``python -m http.server``) through
4+
the ``--tls-cert``, ``--tls-key`` and ``--tls-password-file`` options.
55
Patch by Semyon Moroz.

0 commit comments

Comments
 (0)