[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py - ACTUAL_URL supersedes VIRTUAL_URL and makes the fallback obsolete

[Yvo Schubbe]

Log message for revision 92815:
  - ACTUAL_URL supersedes VIRTUAL_URL and makes the fallback obsolete

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py	2008-11-06 14:00:04 UTC (rev 92814)
+++ Products.CMFCore/trunk/Products/CMFCore/CookieCrumbler.py	2008-11-06 16:05:08 UTC (rev 92815)
@@ -342,11 +342,7 @@
             if page is not None:
                 came_from = req.get('came_from', None)
                 if came_from is None:
-                    came_from = req.get('VIRTUAL_URL', None)
-                    if came_from is None:
-                        came_from = '%s%s%s' % ( req['SERVER_URL'].strip(),
-                                                 req['SCRIPT_NAME'].strip(),
-                                                 req['PATH_INFO'].strip() )
+                    came_from = req.get('ACTUAL_URL')
                     query = req.get('QUERY_STRING')
                     if query:
                         # Include the query string in came_from