[z3-checkins] r42810 - z3/deliverance/trunk/deliverance

[ltucker at codespeak.net]

Author: ltucker
Date: Mon May  7 17:17:20 2007
New Revision: 42810

Modified:
   z3/deliverance/trunk/deliverance/resource_fetcher.py
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
Log:
SCRIPT_INFO -> SCRIPT_NAME, unquote remote urls, fix caching (revert r40855, must intercept 304s for content)

Modified: z3/deliverance/trunk/deliverance/resource_fetcher.py
==============================================================================
--- z3/deliverance/trunk/deliverance/resource_fetcher.py	(original)
+++ z3/deliverance/trunk/deliverance/resource_fetcher.py	Mon May  7 17:17:20 2007
@@ -84,7 +84,7 @@
 
         uri_parts = urlparse.urlparse(self.uri)
         self.environ['PATH_INFO'] = uri_parts[2]
-        self.environ['SCRIPT_INFO'] = '' 
+        self.environ['SCRIPT_NAME'] = '' 
         self.environ['wsgi.scheme'] = 'file'
         if len(uri_parts[4]) > 0: 
             self.environ['QUERY_STRING'] = uri_parts[4] + '&notheme'
@@ -146,10 +146,10 @@
         self.environ['wsgi.url_scheme'] = loc[0]
         self.environ['wsgi.version'] = (1, 0)
         self.environ['HTTP_HOST'] = loc[1]
-        self.environ['PATH_INFO'] = loc[2]
+        self.environ['PATH_INFO'] = urllib.unquote(loc[2])
         self.environ['QUERY_STRING'] = loc[3]
 
-        self.environ['SCRIPT_INFO'] = ''
+        self.environ['SCRIPT_NAME'] = ''
 
         #if loc[0].find(':') != -1: 
         #    self.environ['SERVER_NAME'],self.environ['SERVER_PORT'] = loc[0].split(':')

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Mon May  7 17:17:20 2007
@@ -206,7 +206,7 @@
         """
         type = header_value(headers, 'content-type')
         if type is None:
-            return False # yerg, 304s can have no content-type 
+            return True # yerg, 304s can have no content-type 
         return type.startswith('text/html') or type.startswith('application/xhtml+xml')
 
     def filter_body(self, environ, body):