[or-cvs] r19322: {bridgedb} Or maybe it should display no html at all (bridgedb/trunk/lib/bridgedb)

Tue Apr 14 19:33:07 UTC 2009

Author: nickm
Date: 2009-04-14 15:33:07 -0400 (Tue, 14 Apr 2009)
New Revision: 19322

Modified:
   bridgedb/trunk/lib/bridgedb/Server.py
Log:
Or maybe it should display no html at all

Modified: bridgedb/trunk/lib/bridgedb/Server.py
===================================================================

--- bridgedb/trunk/lib/bridgedb/Server.py	2009-04-14 19:19:15 UTC (rev 19321)
+++ bridgedb/trunk/lib/bridgedb/Server.py	2009-04-14 19:33:07 UTC (rev 19322)
@@ -46,16 +46,6 @@
 </body></html>
 """.strip()
 
-PLAIN_HTML_MESSAGE_TEMPLATE = """
-<html><body>
-<p>Here are your bridge relays:
-<pre id="bridges">
-%s
-</pre>
-</p>
-</body></html>
-"""
-
 EMAIL_MESSAGE_TEMPLATE = """\
 [This is an automated message; please do not reply.]
 
@@ -124,7 +114,8 @@
 
         logging.info("Replying to web request from %s", ip)
         if format == 'plain':
-            return PLAIN_HTML_MESSAGE_TEMPLATE % answer
+            request.setHeader("Content-Type: text/plain")
+            return answer
         else:
             return HTML_MESSAGE_TEMPLATE % answer
 

