Changeset 859

Timestamp:

12/05/05 15:14:59

Author:

lawouach

Message:

you can now define the default content type to be used globally by all responses using server.default._content_type

Files:

• trunk/cherrypy/_cphttptools.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (1 diff)
• trunk/docs/book/xml/configreference.xml (modified) (1 diff)

trunk/cherrypy/_cphttptools.py

@@ -380 +380 @@
-        self.headers = httptools.HeaderMap()
-        self.headerMap = self.headers # Backward compatibility
+        content_type = cherrypy.config.get('server.default_content_type', 'text/html')
-        self.headers.update({
-"text/html"
+content_type
-            "Server": "CherryPy/" + cherrypy.__version__,
-            "Date": httptools.HTTPDate(),

trunk/cherrypy/test/test_core.py

@@ -904 +904 @@
-        self.assertEqual(results, ["None"] * 20)
-
+    def testDefaultContentType(self):
+        self.getPage('/')
+        self.assertHeader('Content-Type', 'text/html')
+        
+        cherrypy.config.update({'server.default_content_type': 'text/plain'})
+        self.getPage('/')
+        self.assertHeader('Content-Type', 'text/plain')
-
-if __name__ == '__main__':

trunk/docs/book/xml/configreference.xml

@@ -26 +26 @@
-        <para><option>[global] server.max_request_header_size</option>: maximum acceptable size of a request header, in bytes (defaults to 500KB). If a longer request arrives, the server will interrupt it and return a 413 error. This setting is global (ie: doesn't depend on the path). Set it to zero to remove the limit</para>
-      </listitem>
+            <listitem>
+                    <para><option>[global] server.default_content_type</option>: default content type to be used for all responses (default to text/html). This setting is global (ie: doesn't depend on the path).</para>
+            </listitem>
-      <listitem>
-        <para><option>[/path] server.max_request_body_size</option>: maximum acceptable size of a request body, in bytes (defaults to 100MB). If a longer request body arrives, the server will interrupt it and return a 413 error. This setting can be configured per path. This is useful to limit the size of uploaded files. Set it to zero to remove the limit</para>