Skip to content

Commit a3243fe

Browse files
committed
gh-135056: Remove --cors opt from http.server in favor of --header
1 parent 5f89c97 commit a3243fe

File tree

4 files changed

+1
-36
lines changed

4 files changed

+1
-36
lines changed

Doc/library/http.server.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -553,15 +553,6 @@ The following options are accepted:
553553

554554
.. versionadded:: 3.14
555555

556-
.. option:: --cors
557-
558-
Adds an additional CORS (Cross-Origin Resource sharing) header to each response::
559-
560-
Access-Control-Allow-Origin: *
561-
562-
.. versionadded:: next
563-
564-
565556
.. _http.server-security:
566557

567558
Security considerations

Lib/http/server.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,8 +1046,6 @@ def _main(args=None):
10461046
parser.add_argument('port', default=8000, type=int, nargs='?',
10471047
help='bind to this port '
10481048
'(default: %(default)s)')
1049-
parser.add_argument('--cors', action='store_true',
1050-
help='Enable Access-Control-Allow-Origin: * header')
10511049
parser.add_argument('-H', '--header', nargs=2, action='append',
10521050
# metavar='HEADER VALUE',
10531051
metavar=('HEADER', 'VALUE'),
@@ -1091,8 +1089,6 @@ class HTTPSDualStackServer(DualStackServerMixin, ThreadingHTTPSServer):
10911089

10921090
ServerClass = HTTPSDualStackServer if args.tls_cert else HTTPDualStackServer
10931091
response_headers = {}
1094-
if args.cors:
1095-
response_headers['Access-Control-Allow-Origin'] = '*'
10961092
for header, value in args.header or []:
10971093
response_headers[header] = value
10981094

Lib/test/test_httpservers.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -829,17 +829,6 @@ def test_path_without_leading_slash(self):
829829
self.tempdir_name + "/?hi=1")
830830

831831

832-
class CorsHTTPServerTestCase(SimpleHTTPServerTestCase):
833-
server_kwargs = {
834-
'response_headers': {'Access-Control-Allow-Origin': '*'}
835-
}
836-
837-
def test_cors(self):
838-
response = self.request(self.base_url + '/test')
839-
self.check_status_and_reason(response, HTTPStatus.OK)
840-
self.assertEqual(response.getheader('Access-Control-Allow-Origin'), '*')
841-
842-
843832
class SocketlessRequestHandler(SimpleHTTPRequestHandler):
844833
def __init__(self, directory=None):
845834
request = mock.Mock()
@@ -1388,17 +1377,6 @@ def test_protocol_flag(self, mock_func):
13881377
mock_func.assert_called_once_with(**call_args)
13891378
mock_func.reset_mock()
13901379

1391-
@mock.patch('http.server.test')
1392-
def test_cors_flag(self, mock_func):
1393-
self.invoke_httpd('--cors')
1394-
call_args = self.args | dict(
1395-
response_headers={
1396-
'Access-Control-Allow-Origin': '*'
1397-
}
1398-
)
1399-
mock_func.assert_called_once_with(**call_args)
1400-
mock_func.reset_mock()
1401-
14021380
@mock.patch('http.server.test')
14031381
def test_header_flag(self, mock_func):
14041382
self.invoke_httpd('--header', 'h1', 'v1', '-H', 'h2', 'v2')
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Add a ``--cors`` cli option to :program:`python -m http.server`. Contributed by
1+
Add a ``--header`` cli option to :program:`python -m http.server`. Contributed by
22
Anton I. Sipos.

0 commit comments

Comments
 (0)