Skip to content

Commit a10cb3a

Browse files
pythongh-131715: Allow end_headers() before any header is buffered
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent dcf9087 commit a10cb3a

3 files changed

Lines changed: 17 additions & 0 deletions

File tree

‎Lib/http/server.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,8 @@ def send_header(self, keyword, value, *, _is_extra=False):
576576
def end_headers(self):
577577
"""Send the blank line ending the MIME headers."""
578578
if self.request_version != 'HTTP/0.9':
579+
if not hasattr(self, '_headers_buffer'):
580+
self._headers_buffer = []
579581
self._headers_buffer.append(b"\r\n")
580582
self.flush_headers()
581583

‎Lib/test/test_httpservers.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,6 +1199,18 @@ def test_header_buffering_of_send_header(self):
11991199
self.assertEqual(output.getData(), b'Foo: foo\r\nbar: bar\r\n\r\n')
12001200
self.assertEqual(output.numWrites, 1)
12011201

1202+
def test_end_headers_without_buffered_headers(self):
1203+
# gh-131715: end_headers() must not raise AttributeError if no
1204+
# response line or header has been buffered yet.
1205+
output = AuditableBytesIO()
1206+
handler = SocketlessRequestHandler()
1207+
handler.wfile = output
1208+
handler.request_version = 'HTTP/1.1'
1209+
1210+
handler.end_headers()
1211+
self.assertEqual(output.getData(), b'\r\n')
1212+
self.assertEqual(output.numWrites, 1)
1213+
12021214
def test_header_unbuffered_when_continue(self):
12031215

12041216
def _readAndReseek(f):
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix :exc:`AttributeError` raised by
2+
:meth:`http.server.BaseHTTPRequestHandler.end_headers` when no response line or
3+
header had been sent before.

0 commit comments

Comments
 (0)