[z3-checkins] r41938 - z3/deliverance/DeliveranceVHoster/trunk/dvhoster

[ianb at codespeak.net]

Author: ianb
Date: Fri Apr  6 17:03:29 2007
New Revision: 41938

Modified:
   z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py
Log:
Set remote_uris headers before calling find_remote_uri

Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py	Fri Apr  6 17:03:29 2007
@@ -253,14 +253,14 @@
                 remote_uri = remote_uri_info.get('remote_uri')
                 environ['SCRIPT_NAME'] += path[:-1]
                 environ['PATH_INFO'] = path_info[len(path)-1:]
-                if self.find_remote_uri:
-                    remote_uri = self.find_remote_uri(remote_uri, remote_uri_info, environ, self.app_conf)
                 if remote_uri_info.get('headers'):
                     for header_name, header_value in remote_uri_info['headers'].items():
                         header_name = header_name.upper().replace('-', '_')
                         if not header_name.startswith('HTTP_'):
                             header_name = 'HTTP_' + header_name
                         environ[str(header_name)] = str(header_value)
+                if self.find_remote_uri:
+                    remote_uri = self.find_remote_uri(remote_uri, remote_uri_info, environ, self.app_conf)
                 return remote_uri
         if self.find_remote_uri:
             # Last change for find_remote_uri to do something