Ticket #1919: wsgi.patch

controllers.py

@@ -501 +501 @@
     """Computes URLs.
 
     tgpath can be a list or a string. If the path is absolute (starts
-    with a "/"), the server.webpath and the approot of the application
-    are prepended to the path. In order for the approot to be
-    detected properly, the root object should extend
+    with a "/"), the server.webpath, SCRIPT_NAME and the approot of the
+    application are prepended to the path. In order for the approot to
+    be detected properly, the root object should extend
     controllers.RootController.
 
     Query parameters for the URL can be passed in as a dictionary in
@@ -516 +516 @@
     if not isinstance(tgpath, basestring):
         tgpath = "/".join(list(tgpath))
     if tgpath.startswith("/"):
+        webpath = config.get('server.webpath', '').rstrip('/')
         if tg_util.request_available():
             check_app_root()
             tgpath = request.app_root + tgpath
-        result = config.get("server.webpath", "") + tgpath
-    else:
-        result = tgpath
+            try:
+                webpath += request.wsgi_environ['SCRIPT_NAME'].rstrip('/')
+            except (AttributeError, KeyError):
+                pass
+        tgpath = webpath + tgpath
     if tgparams is None:
         tgparams = kw
     else:
@@ -545 +548 @@
                 v = v.encode("utf8")
             args.append("%s=%s" % (k, urllib.quote(str(v))))
     if args:
-        result += "?" + "&".join(args)
-    return result
+        tgpath += "?" + "&".join(args)
+    return tgpath
 
 
 def check_app_root():

startup.py

@@ -78 +78 @@
 
 cherrypy.lib.autoreload.reloader_thread = reloader_thread
 
-webpath = ""
+webpath = ''
 
 DNS_SD_PID = None
 
@@ -129 +129 @@
     maps to the root object "/".
     """
 
+    def __init__(self, webpath=''):
+        webpath = webpath.rstrip('/')
+        if webpath and not webpath.startswith('/'):
+             webpath = '/' + webpath
+        self.webpath = webpath
+
     def on_start_resource(self):
-        prefix = config.get('server.webpath', False)
-        if prefix:
+        webpath = self.webpath
+        try:
+            webpath += cherrypy.request.wsgi_environ['SCRIPT_NAME'].rstrip('/')
+        except (AttributeError, KeyError):
+            pass
+        if webpath:
             path = cherrypy.request.object_path
-            if path == prefix:
+            if path == webpath:
                 cherrypy.request.object_path = '/'
-            elif path.startswith(prefix):
-                cherrypy.request.object_path = path[len(prefix):]
+            elif path.startswith(webpath):
+                cherrypy.request.object_path = path[len(webpath):]
             else:
                 raise cherrypy.NotFound(path)
 
@@ -182 +192 @@
     view.load_engines()
     view.loadBaseTemplates()
     global webpath
-    webpath = config.get("server.webpath", "")
+    webpath = config.get('server.webpath', '')
 
-    if hasattr(cherrypy, "root") and cherrypy.root:
-        if not hasattr(cherrypy.root, "_cp_filters"):
+    if hasattr(cherrypy, 'root') and cherrypy.root:
+        if not hasattr(cherrypy.root, '_cp_filters'):
             cherrypy.root._cp_filters= []
-        morefilters = [EndTransactionsFilter(),
-                       NestedVariablesFilter()]
-        if webpath:
-            morefilters.insert(0, VirtualPathFilter())
+        morefilters = [EndTransactionsFilter(), NestedVariablesFilter()]
+        morefilters.insert(0, VirtualPathFilter(webpath))
         cherrypy.root._cp_filters.extend(morefilters)
 
-    if webpath.startswith("/"):
-        webpath = webpath[1:]
-    if webpath and not webpath.endswith("/"):
-        webpath = webpath + "/"
+    webpath = webpath.lstrip('/')
+    if webpath and not webpath.endswith('/'):
+        webpath += '/'
+
     isdev = config.get('server.environment') == 'development'
     if not config.get("tg.new_style_logging"):
         if config.get('server.log_to_screen'):