Merge branch 'release_16.04' into dev

galaxyproject · May 11, 2016 · 073f37a · 073f37a
2 parents 6ca6ba1 + 0138136
commit 073f37a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/galaxy/web/base/interactive_environments.py b/lib/galaxy/web/base/interactive_environments.py
@@ -71,6 +71,11 @@ def __init__(self, trans, plugin):
             )
         else:
             self.attr.proxy_prefix = ''
+        # If cookie_path is unset (thus '/'), the proxy prefix ends up with
+        # multiple leading '/' characters, which will cause the client to
+        # request resources from http://dynamic_proxy_prefix
+        if self.attr.proxy_prefix.startswith('/'):
+            self.attr.proxy_prefix = '/' + self.attr.proxy_prefix.lstrip('/')
 
     def load_allowed_images(self):
         if os.path.exists(os.path.join(self.attr.our_config_dir, 'allowed_images.yml')):