Changeset 339

Timestamp:

06/17/05 14:48:32

Author:

fumanchu

Message:

Handle all HTTP methods.

Files:

• trunk/cherrypy/_cphttpserver.py (modified) (2 diffs)
• trunk/cherrypy/_cphttptools.py (modified) (4 diffs)
• trunk/cherrypy/_cpwsgi.py (modified) (2 diffs)
• trunk/cherrypy/test/test_core.py (modified) (2 diffs)

trunk/cherrypy/_cphttpserver.py

@@ -70 +70 @@
-        return list
-    
-
+
+
+
+
+
+
+
+
+
+
-        cpg.request.multithread = cpg.config.get("server.threadPool") > 1
-        cpg.request.multiprocess = False
@@ -92 +101 @@
-            for chunk in b:
-                wfile.write(chunk)
-
-
-
-
-
-
-
-
-
+
+
+
-    
-    def log_message(self, format, *args):

trunk/cherrypy/_cphttptools.py

@@ -114 +114 @@
-        self.requestLine = requestLine
-        self.requestHeaders = headers
-        self.rfile = rfile
-        
-        # Prepare cpg.request variables
@@ -123 +122 @@
-        cpg.request.requestLine = requestLine
-        cpg.request.simpleCookie = Cookie.SimpleCookie()
-self.
+
-        
-        # Prepare cpg.response variables
@@ -144 +143 @@
-        
-        self.run()
+        
+        if cpg.request.method == "HEAD":
+            # HEAD requests MUST NOT return a message-body in the response.
+            cpg.response.body = []
-    
-    def run(self):
@@ -223 +226 @@
-        for key, value in cpg.request.headerMap.items():
-            lowerHeaderMap[key.lower()] = value
- = self.rfile, headers = 
+=cpg.request.rfile, headers=
-                                      environ = {'REQUEST_METHOD': 'POST'},
-                                      keep_blank_values = 1)

trunk/cherrypy/_cpwsgi.py

@@ -100 +100 @@
-            # not take any time at all if chunk is already of type "str".
-            # If it's unicode, it could be a big performance hit (x ~500).
-
+
+
-    except:
-        tb = _cphttptools.formatExc()
@@ -116 +117 @@
-# Server components
-
-class WSGIRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-    
-    server_version = "CherryPyWSGI/2.1"
-    os_environ = dict(os.environ.items())
-    
-    def handle_one_request(self):
-        """Handle a single HTTP request. Overridden to handle all verbs."""
-        response = None
-        self.headers_sent = False
-        self.responseHeaders = []
-        try:
-            try:
-                self.raw_requestline = self.rfile.readline()
-                if not self.raw_requestline:
-                    self.close_connection = 1
-                    return
-                
-                if not self.parse_request():
-                    return
-                
-                response = wsgiApp(self.environ(), self.start_response)
-                for chunk in response:
-                    self.write(chunk)
-            except:
-                self.handleError(sys.exc_info())
-        finally:
-            if hasattr(response, 'close'):
-                response.close()
-    
-    def environ(self):
-        env = {'wsgi.version': (1, 0),
-               'wsgi.input': self.rfile,
-               'wsgi.errors': sys.stderr,
-               'wsgi.multithread': (cpg.config.get("server.threadPool") > 1),
-               'wsgi.multiprocess': False,
-               'wsgi.run_once': False,
-               'SERVER_PROTOCOL': self.request_version,
-               'GATEWAY_INTERFACE': 'CGI/1.1',
-               'CONTENT_TYPE': self.headers.get('Content-Type', ''),
-               'CONTENT_LENGTH': self.headers.get('Content-Length', ''),
-               # SCRIPT_NAME doesn't really apply to CherryPy
-               'SCRIPT_NAME': '',
-               }
-        
-        env['SERVER_NAME'] = cpg.config.get('server.socketHost')
-        env['SERVER_PORT'] = cpg.config.get('server.socketPort')
-        
-        if self.os_environ.get("HTTPS") in ('yes', 'on', '1'):
-            env['wsgi.url_scheme'] = 'https'
-        else:
-            env['wsgi.url_scheme'] = 'http'
-        
-        host, port = self.client_address[:2]
-        env['REMOTE_ADDR'] = host
-        
-        fullhost = socket.getfqdn(host)
-        if fullhost == host:
-            env['REMOTE_HOST'] = ''
-        else:
-            env['REMOTE_HOST'] = fullhost
-        
-        # Update env with results of parse_request
-        env['REQUEST_METHOD'] = self.command
-        env['SERVER_PROTOCOL'] = self.request_version
-        
-        if '?' in self.path:
-            path, query = self.path.split('?', 1)
-        else:
-            path, query = self.path, ''
-        env['PATH_INFO'] = urllib.unquote(path)
-        env['QUERY_STRING'] = query
-        
-        # Update env with additional request headers
-        for name, value in self.headers.items():
-            env['HTTP_%s' % name.replace ('-', '_').upper()] = value
-        return env
-    
-    def start_response(self, status, headers, exc_info=None):
-        if exc_info:
-            try:
-                if self.headers_sent:
-                    raise exc_info[0], exc_info[1], exc_info[2]
-            finally:
-                # avoid dangling circular ref
-                exc_info = None
-        elif self.responseHeaders:
-            raise AssertionError("Headers already set!")
-        self.status = status
-        self.responseHeaders = headers[:]
-        return self.write
-    
-    def write(self, data):
-        if not self.headers_sent:
-            code, reason = self.status.split(" ", 1)
-            self.send_response(int(code), reason)
-            for name, value in self.responseHeaders:
-                self.send_header(name, value)
-            self.end_headers()
-            self.headers_sent = True
-        self.wfile.write(data)
-    
-    def send_response(self, code, message=None):
-        self.log_request(code)
-        if message is None:
-            if code in self.responses:
-                message = self.responses[code][0]
-            else:
-                message = ''
-        if self.request_version != 'HTTP/0.9':
-            self.wfile.write("%s %d %s\r\n" %
-                             (self.protocol_version, code, message))
-    
-    def handleError(self, exc):
-        self.close_connection = 1
-        msg = _cphttptools.formatExc(exc)
-        _cputil.getSpecialAttribute('_cpLogMessage')(msg, "HTTP")
-        self.status, self.headers, body = _cphttptools.bareError()
-        self.write(body)
-
-
-class WSGIServer(_cpwsgiserver.CherryPyWSGIServer):
-    def __init__(self):

trunk/cherrypy/test/test_core.py

@@ -139 +139 @@
-        
-        return "double header test"
+
+
+defined_http_methods = ("OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE",
+                        "TRACE", "CONNECT")
+class Method(Test):
+    
+    def index(self):
+        m = cpg.request.method
+        if m in defined_http_methods:
+            return m
+        
+        if m == "LINK":
+            cpg.response.status = 405
+        else:
+            cpg.response.status = 501
-
-
@@ -243 +258 @@
-                                  'Location', 'Server'])
-        self.assertEqual(cpg.response.body, "double header test")
+    
+    def testMethods(self):
+        # Test that all defined HTTP methods work.
+        for m in defined_http_methods:
+            h = []
+            if m == 'POST':
+                h = [("Content-type", "application/x-www-form-urlencoded"),
+                     ("Content-Length", "0")]
+            helper.request("/method/", h, method=m, body='')
+            
+            # HEAD requests should not return any body.
+            if m == "HEAD":
+                m = ""
+            
+            self.assertEqual(cpg.response.body, m)
+        
+        # Request a disallowed method
+        helper.request("/method/", method="LINK")
+        self.assertEqual(cpg.response.status, "405 Method Not Allowed")
+        
+        # Request an unknown method
+        helper.request("/method/", method="SEARCH")
+        self.assertEqual(cpg.response.status, "501 Not Implemented")
-
-