Changeset 1994

Timestamp:

06/28/08 20:22:52

Author:

fumanchu

Message:

Fix for #803 (run CP under Google App Engine).

Files:

• trunk/cherrypy/_cprequest.py (modified) (1 diff)
• trunk/cherrypy/_cpserver.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgi.py (modified) (2 diffs)
• trunk/cherrypy/_cpwsgi_server.py (added)
• trunk/cherrypy/lib/http.py (modified) (1 diff)

trunk/cherrypy/_cprequest.py

@@ -717 +717 @@
-                                          environ={'REQUEST_METHOD': "POST"},
-                                          keep_blank_values=1)
-
-
-
+
+
+
+
+
+
-        
-        # Note that, if headers['Content-Type'] is multipart/*,

trunk/cherrypy/_cpserver.py

@@ -71 +71 @@
-            httpserver = self.instance
-        if httpserver is None:
-
-
+_server
+_server
-        if isinstance(httpserver, basestring):
-            httpserver = attributes(httpserver)()

trunk/cherrypy/_cpwsgi.py

@@ -5 +5 @@
-
-import cherrypy as _cherrypy
-, wsgiserver
+
-from cherrypy.lib import http as _http
-
@@ -329 +329 @@
-            bucket[arg] = v
-
-
-
-#                            Server components                            #
-
-
-class CPHTTPRequest(wsgiserver.HTTPRequest):
-    
-    def __init__(self, sendall, environ, wsgi_app):
-        s = _cherrypy.server
-        self.max_request_header_size = s.max_request_header_size or 0
-        self.max_request_body_size = s.max_request_body_size or 0
-        wsgiserver.HTTPRequest.__init__(self, sendall, environ, wsgi_app)
-
-
-class CPHTTPConnection(wsgiserver.HTTPConnection):
-    
-    RequestHandlerClass = CPHTTPRequest
-
-
-class CPWSGIServer(wsgiserver.CherryPyWSGIServer):
-    """Wrapper for wsgiserver.CherryPyWSGIServer.
-    
-    wsgiserver has been designed to not reference CherryPy in any way,
-    so that it can be used in other frameworks and applications. Therefore,
-    we wrap it here, so we can set our own mount points from cherrypy.tree
-    and apply some attributes from config -> cherrypy.server -> wsgiserver.
-    """
-    
-    ConnectionClass = CPHTTPConnection
-    
-    def __init__(self):
-        server = _cherrypy.server
-        sockFile = server.socket_file
-        if sockFile:
-            bind_addr = sockFile
-        else:
-            bind_addr = (server.socket_host, server.socket_port)
-        
-        s = wsgiserver.CherryPyWSGIServer
-        s.__init__(self, bind_addr, _cherrypy.tree,
-                   server.thread_pool,
-                   server.socket_host,
-                   request_queue_size = server.socket_queue_size,
-                   timeout = server.socket_timeout,
-                   shutdown_timeout = server.shutdown_timeout,
-                   )
-        self.protocol = server.protocol_version
-        self.nodelay = server.nodelay
-        self.ssl_certificate = server.ssl_certificate
-        self.ssl_private_key = server.ssl_private_key
-

trunk/cherrypy/lib/http.py

@@ -378 +378 @@
-
-
-from cherrypy.wsgiserver import MaxSizeExceeded
-
-
-class Host(object):