From 718cd97da635816a7309d7f6595ec0f6616046e6 Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Tue, 1 Jul 2008 20:02:06 +0000 Subject: [PATCH] 2008-07-01 yusei * my previous commit was wrong. I revert the changes. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22203 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_core/setAuthCookie.xml | 300 ------------------ .../ERP5/bootstrap/erp5_core/bt/change_log | 3 - product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 3 files changed, 1 insertion(+), 304 deletions(-) delete mode 100644 product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/setAuthCookie.xml diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/setAuthCookie.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/setAuthCookie.xml deleted file mode 100644 index d161e8471f..0000000000 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/setAuthCookie.xml +++ /dev/null @@ -1,300 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Python_magic</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_Access_contents_information_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_Change_bindings_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_Change_cache_settings_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_Change_permissions_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_Copy_or_Move_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_Delete_objects_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_Manage_WebDAV_Locks_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_Manage_properties_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_Take_ownership_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_Undo_changes_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_View_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_View_management_screens_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_WebDAV_Lock_items_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_WebDAV_Unlock_items_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>_WebDAV_access_Permission</string> </key> - <value> - <list> - <string>Manager</string> - </list> - </value> - </item> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>portal = context.getPortalObject()\n -\n -virtual_url_parts = context.REQUEST.get(\'VIRTUAL_URL_PARTS\', ())\n -path_list = []\n -if len(virtual_url_parts) == 3:\n - portal_absolute_path = portal.absolute_url(1)\n - path_list.append(virtual_url_parts[1])\n - if portal_absolute_path:\n - path_list.append(portal_absolute_path)\n -else:\n - path_list.append(portal.absolute_url(relative=1))\n -\n -path = \'/\' + \'/\'.join(path_list)\n -\n -response.setCookie( cookie_name, cookie_value, path=path)\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_filepath</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>response, cookie_name, cookie_value</string> </value> - </item> - <item> - <key> <string>_proxy_roles</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>response</string> - <string>cookie_name</string> - <string>cookie_value</string> - <string>_getattr_</string> -<string>context</string> - <string>portal</string> - <string>virtual_url_parts</string> - <string>path_list</string> - <string>len</string> - <string>portal_absolute_path</string> - <string>_getitem_</string> - <string>path</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>setAuthCookie</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Set Authentication Cookie</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index 246d84894d..779b6cd77a 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,6 +1,3 @@ -2008-07-01 yusei -* Fixed cookie path problem under virtual host. - 2008-06-27 yusei * Start to develop version 5.2. diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index e39afc8dd2..354d30ba65 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -868 \ No newline at end of file +869 \ No newline at end of file -- 2.30.9