[Zope-Checkins] SVN: Zope/branches/Zope-2_8-branch/ - Collector 2077: fixed problem with ACTUAL_URL and SiteRoot

[Andreas Jung]

Log message for revision 68568:
        - Collector 2077: fixed problem with ACTUAL_URL and SiteRoot
  
  

Changed:
  U   Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
  U   Zope/branches/Zope-2_8-branch/lib/python/Products/SiteAccess/SiteRoot.py

-=-
Modified: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
===================================================================
--- Zope/branches/Zope-2_8-branch/doc/CHANGES.txt	2006-06-10 13:51:22 UTC (rev 68567)
+++ Zope/branches/Zope-2_8-branch/doc/CHANGES.txt	2006-06-10 13:52:14 UTC (rev 68568)
@@ -21,7 +21,9 @@
       - Collector #2116: sequence.sort() did not work properly
         locale related comparison methods
 
+      - Collector 2077: fixed problem with ACTUAL_URL and SiteRoot
 
+
   Zope 2.8.7 (2007/05/29)
 
     Features added:

Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/SiteAccess/SiteRoot.py
===================================================================
--- Zope/branches/Zope-2_8-branch/lib/python/Products/SiteAccess/SiteRoot.py	2006-06-10 13:51:22 UTC (rev 68567)
+++ Zope/branches/Zope-2_8-branch/lib/python/Products/SiteAccess/SiteRoot.py	2006-06-10 13:52:14 UTC (rev 68568)
@@ -117,10 +117,13 @@
                 if srd[i] is None:
                     srd[i] = request.environ.get(srp, None)
         if srd[0] is not None:
+            request['ACTUAL_URL'] = request['ACTUAL_URL'].replace(request['SERVER_URL'], srd[0])
             request['SERVER_URL'] = srd[0]
             request._resetURLS()
         if srd[1] is not None:
+            old = request['URL']
             request.setVirtualRoot(srd[1])
+            request['ACTUAL_URL'] = request['ACTUAL_URL'].replace(old, request['URL'])
 
     def get_size(self):
         '''Make FTP happy'''