fix: roundup-server Content-Length when generating index

rouilj · rouilj · commit 76c771ccde60 · 2024-06-17T23:18:37.000-04:00
Cleanup tracker index generation by roundup-server. Send correct
Content-Length headers so HTTP/1.1 connections don't hang.

Also added charset to the Content-Type header.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -174,6 +174,9 @@ Fixed:
   roundup-server in SSL/TLS mode. Report better error messages
   when PEM file is missing certificate or private key. (John
   Rouillard)
+- Cleanup tracker index generation by roundup-server. Send
+  correct Content-Length headers so HTTP/1.1 connections don't
+  hang. (John Rouillard)
 
 Features:
 
diff --git a/roundup/scripts/roundup_server.py b/roundup/scripts/roundup_server.py
@@ -320,12 +320,14 @@ def index(self):
         if len(keys) == 1:
             self.send_response(302)
             self.send_header('Location', urllib_.quote(keys[0]) + '/index')
+            self.send_header('Content-Length', 0)
             self.end_headers()
-        else:
-            self.send_response(200)
+            return
+
+        self.send_response(200)
+        self.send_header('Content-Type', 'text/html; charset=utf-8')
+        output = []
 
-        self.send_header('Content-Type', 'text/html')
-        self.end_headers()
         w = self.wfile.write
 
         if self.CONFIG and self.CONFIG['TEMPLATE']:
@@ -336,16 +338,22 @@ def index(self):
                      'nothing': None,
                      'true': 1,
                      'false': 0}
-            w(s2b(pt.pt_render(extra_context=extra)))
+            output.append(s2b(pt.pt_render(extra_context=extra)))
         else:
-            w(s2b(_('<html><head><title>Roundup trackers index</title></head>\n'
-                    '<body><h1>Roundup trackers index</h1><ol>\n')))
+            output.append(s2b(_(
+                '<html><head><title>Roundup trackers index</title></head>\n'
+                '<body><h1>Roundup trackers index</h1><ol>\n')))
             keys.sort()
             for tracker in keys:
-                w(s2b('<li><a href="%(tracker_url)s/index">%(tracker_name)s</a>\n' % {
+                output.append(s2b('<li><a href="%(tracker_url)s/index">%(tracker_name)s</a>\n' % {
                     'tracker_url': urllib_.quote(tracker),
                     'tracker_name': html_escape(tracker)}))
-            w(b'</ol></body></html>')
+            output.append(b'</ol></body></html>\n')
+
+        write_output = b"\n".join(output)
+        self.send_header('Content-Length', len(write_output))
+        self.end_headers()
+        w(write_output)
 
     def inner_run_cgi(self):
         ''' This is the inner part of the CGI handling
