Merge commit '15997618e' into anoa/dinsic_release_1_18_x

* commit '15997618e':
  Clean up PreserveLoggingContext (#7877)
  fix an incorrect comment

1 files changed, 2 insertions, 2 deletions

diff --git a/synapse/http/server.py b/synapse/http/server.py

index cff49202f4..8e003689c4 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -575,8 +575,8 @@ def respond_with_json_bytes(
     if send_cors:
         set_cors_headers(request)
 
-    # todo: we can almost certainly avoid this copy and encode the json straight into
-    # the bytesIO, but it would involve faffing around with string->bytes wrappers.
+    # note that this is zero-copy (the bytesio shares a copy-on-write buffer with
+    # the original `bytes`).
     bytes_io = BytesIO(json_bytes)
 
     producer = NoRangeStaticProducer(request, bytes_io)