Changeset 815

Timestamp:

11/12/05 06:55:17

Author:

lawouach

Message:

Moved the code handling OPTIONS * request to _cputil to a special function attribute called _cpGlobalInformation.

Added support for printing the HTTP request headers when an error is logged. This can be controlled via server.showRequestHeaders in the config settings.

Files:

• trunk/cherrypy/_cphttptools.py (modified) (1 diff)
• trunk/cherrypy/_cputil.py (modified) (3 diffs)
• trunk/cherrypy/config.py (modified) (3 diffs)

trunk/cherrypy/_cphttptools.py

@@ -63 +63 @@
-            # right away.
-            self.processRequestLine(requestLine)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            
-            try:

trunk/cherrypy/_cputil.py

@@ -71 +71 @@
-        raise cherrypy.HTTPError(500, msg)
-
+def _cpGlobalInformation():
+    """Handles OPTIONS * HTTP/1.1 requests"""
+    request = cherrypy.request
+    if request.method == 'OPTIONS':
+        # this normally should be * but processRequestLine
+        # switched it to 'global' for the configuration handling
+        if request.path == 'global':
+            # OPTIONS is defined in HTTP 1.1
+            if request.version >= '1.1':
+                response = cherrypy.response
+                response.body = []
+                response.status = '200 OK'
+                response.headerMap['Allow'] = 'HEAD, GET, POST, PUT, OPTIONS'
+                response.headerMap['Content-Length'] = 0
+                response.headerMap['Content-Type'] = 'text/plain'
+                response.finalize()
+                getSpecialAttribute("_cpLogAccess")()
+                return True
+    return False
+
-def logtime():
-    return '%04d/%02d/%02d %02d:%02d:%02d' % time.localtime(time.time())[:6]
@@ -103 +123 @@
-    
-    level = _log_severity_levels.get(severity, "UNKNOWN")
-
+
+
+
+
+
+
-    
-    if cherrypy.config.get('server.logToScreen', True):
@@ -273 +298 @@
-    return "".join(traceback.format_exception(*exc))
-
+def format_request_headers():
+    """returns the list of request headers as a string separated by new lines, one header on each line"""
+    if hasattr(cherrypy.request, 'headerMap'):
+        headers = '\n'.join(': '.join((header, value)) for header, value in cherrypy.request.headerMap.items())
+        return ''.join(('\n', headers, '\n', '\n'))
+    return ''
+
-def bareError(extrabody=None):
-    """Produce status, headers, body for a critical error.

trunk/cherrypy/config.py

@@ -31 +31 @@
-        'server.logFileNotFound': True,
-        'server.showTracebacks': True,
+        'server.showRequestHeaders': True,
-        },
-    "staging": {
@@ -37 +38 @@
-        'server.logFileNotFound': False,
-        'server.showTracebacks': False,
+        'server.showRequestHeaders': False,
-        },
-    "production": {
@@ -43 +45 @@
-        'server.logFileNotFound': False,
-        'server.showTracebacks': False,
+        'server.showRequestHeaders': False,
-        },
-    }