[z3-checkins] r33435 - z3/deliverance/branches/packaged/deliverance

[ltucker at codespeak.net]

Author: ltucker
Date: Thu Oct 19 00:47:50 2006
New Revision: 33435

Modified:
   z3/deliverance/branches/packaged/deliverance/wsgifilter.py
Log:
remove query string from base url to avoid redirecting externally by accident

Modified: z3/deliverance/branches/packaged/deliverance/wsgifilter.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/wsgifilter.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/wsgifilter.py	Thu Oct 19 00:47:50 2006
@@ -77,7 +77,7 @@
 
     def __call__(self, environ, start_response):
         qs = environ.get('QUERY_STRING', '')
-        environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False)
+        environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False, with_query_string=False)
         notheme = 'notheme' in qs
         if notheme:
             return self.app(environ, start_response)
@@ -112,7 +112,7 @@
         internalBaseURL = environ.get(DELIVERANCE_BASE_URL,None)
         uri = urlparse.urljoin(internalBaseURL, uri)
         
-        if self.relative_uri(uri) or (internalBaseURL and uri.startswith(internalBaseURL)):
+        if  internalBaseURL and uri.startswith(internalBaseURL):
             return self.get_internal_resource(environ, uri[len(internalBaseURL):])
         else:
             return self.get_external_resource(uri)