Changeset 1431

Timestamp:

11/16/06 14:59:58

Author:

fumanchu

Message:

Fix for #600 (InternalRedirect? does double duty). This dispwrappers.patch changes vhost and xmlrpc from using InternalRedirect? (which rewrites request.path_info) to dispatch wrapper functions (which do not).

Files:

• trunk/cherrypy/_cpdispatch.py (modified) (1 diff)
• trunk/cherrypy/_cptools.py (modified) (3 diffs)
• trunk/cherrypy/lib/cptools.py (modified) (1 diff)
• trunk/cherrypy/test/test_virtualhost.py (modified) (3 diffs)
• trunk/cherrypy/test/test_xmlrpc.py (modified) (2 diffs)

trunk/cherrypy/_cpdispatch.py

@@ -309 +309 @@
-        
-        return handler
+
+
+def XMLRPCDispatcher(next_dispatcher=Dispatcher()):
+    from cherrypy.lib import xmlrpc
+    def xmlrpc_dispatch(path_info):
+        path_info = xmlrpc.patched_path(path_info)
+        return next_dispatcher(path_info)
+    return xmlrpc_dispatch
+
+
+def VirtualHost(next_dispatcher=Dispatcher(), use_x_forwarded_host=True, **domains):
+    """Select a different handler based on the Host header.
+    
+    Useful when running multiple sites within one CP server.
+    
+    From http://groups.google.com/group/cherrypy-users/browse_thread/thread/f393540fe278e54d:
+    
+    For various reasons I need several domains to point to different parts of a
+    single website structure as well as to their own "homepage"   EG
+    
+    http://www.mydom1.com  ->  root
+    http://www.mydom2.com  ->  root/mydom2/
+    http://www.mydom3.com  ->  root/mydom3/
+    http://www.mydom4.com  ->  under construction page
+    
+    but also to have  http://www.mydom1.com/mydom2/  etc to be valid pages in
+    their own right.
+    """
+    from cherrypy.lib import http
+    def vhost_dispatch(path_info):
+        header = cherrypy.request.headers.get
+        
+        domain = header('Host', '')
+        if use_x_forwarded_host:
+            domain = header("X-Forwarded-Host", domain)
+        
+        prefix = domains.get(domain, "")
+        if prefix:
+            path_info = http.urljoin(prefix, path_info)
+        
+        return next_dispatcher(path_info)
+    return vhost_dispatch
+

trunk/cherrypy/_cptools.py

@@ -215 +215 @@
-
-
-class XMLRPCTool(object):
-    """Tool for using XMLRPC over HTTP.
-    
-    Python's None value cannot be used in standard XML-RPC; to allow
-    using it via an extension, provide a true value for allow_none.
-    """
-    
-    def _setup(self):
-        """Hook this tool into cherrypy.request."""
-        request = cherrypy.request
-        
-        # Guard against running this method twice.
-        if hasattr(request, 'xmlrpc'):
-            return
-        request.xmlrpc = True
-        
-        request.error_response = _xmlrpc.on_error
-        path_info = request.path_info
-        ppath = _xmlrpc.patched_path(path_info)
-        if ppath != path_info:
-            raise cherrypy.InternalRedirect(ppath)
-
-
-class WSGIAppTool(HandlerTool):
-    """A tool for running any WSGI middleware/application within CP.
@@ -333 +310 @@
-_d.proxy = Tool('before_request_body', cptools.proxy, priority=30)
-_d.response_headers = Tool('on_start_resource', cptools.response_headers)
-_d.virtual_host = Tool('on_start_resource', cptools.virtual_host, priority=40)
-_d.log_tracebacks = Tool('before_error_response', cptools.log_traceback)
-_d.log_headers = Tool('before_error_response', cptools.log_request_headers)
@@ -346 +322 @@
-# _sessions.init must be bound after headers are read
-_d.sessions = SessionTool('before_request_body', _sessions.init)
-XMLRPCTool(
+ErrorTool(_xmlrpc.on_error
-_d.wsgiapp = WSGIAppTool(_wsgiapp.run)
-_d.caching = CachingTool('before_handler', _caching.get, 'caching')

trunk/cherrypy/lib/cptools.py

@@ -272 +272 @@
-                 for k in dir(SessionAuth) if not k.startswith("__")])
-
-
-def virtual_host(use_x_forwarded_host=True, **domains):
-    """Redirect internally based on the Host header.
-    
-    Useful when running multiple sites within one CP server.
-    
-    From http://groups.google.com/group/cherrypy-users/browse_thread/thread/f393540fe278e54d:
-    
-    For various reasons I need several domains to point to different parts of a
-    single website structure as well as to their own "homepage"   EG
-    
-    http://www.mydom1.com  ->  root
-    http://www.mydom2.com  ->  root/mydom2/
-    http://www.mydom3.com  ->  root/mydom3/
-    http://www.mydom4.com  ->  under construction page
-    
-    but also to have  http://www.mydom1.com/mydom2/  etc to be valid pages in
-    their own right.
-    """
-    request = cherrypy.request
-    
-    # Guard against running twice.
-    if hasattr(request, "virtual_prefix"):
-        return
-    
-    domain = request.headers.get('Host', '')
-    if use_x_forwarded_host:
-        domain = request.headers.get("X-Forwarded-Host", domain)
-    
-    request.virtual_prefix = prefix = domains.get(domain, "")
-    if prefix:
-        raise cherrypy.InternalRedirect(_http.urljoin(prefix, request.path_info))
-
-def log_traceback():

trunk/cherrypy/test/test_virtualhost.py

@@ -4 +4 @@
-
-import cherrypy
+from cherrypy import _cpdispatch
-
-def setup_server():
@@ -39 +40 @@
-    root.mydom2 = VHost("Domain 2")
-    root.mydom3 = VHost("Domain 3")
-
+
+
+
+
+
+
+
-    
-
-
-
-
-
-
-
+
-
-from cherrypy.test import helper
@@ -77 +78 @@
-        self.assertBody("You sent 'pos'")
-        
+        # Test that cherrypy.url uses the browser url, not the virtual url
-        self.getPage("/url", [('Host', 'www.mydom2.com')])
-        self.assertBody("http://www.mydom2.com/nextpage")

trunk/cherrypy/test/test_xmlrpc.py

@@ -2 +2 @@
-test.prefer_parent_path()
-import xmlrpclib
+
+from cherrypy import _cpdispatch
-
-
@@ -58 +60 @@
-    root = Root()
-    root.xmlrpc = XmlRpc()
-
+
+
+
-    cherrypy.config.update({'environment': 'test_suite'})
-