fixed: a default winix function was selected before the mount point was calculated
also a mount point should be cleared (set to an empty mount point) at the end of a request git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1117 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
parent
1c05c31721
commit
350fc551e5
|
@ -408,6 +408,7 @@ void App::ProcessRequestThrow()
|
||||||
|
|
||||||
if( !cur.request->dir_tab.empty() )
|
if( !cur.request->dir_tab.empty() )
|
||||||
{
|
{
|
||||||
|
cur.mount = system.mounts.CalcCurMount();
|
||||||
functions.CheckFunctionAndSymlink();
|
functions.CheckFunctionAndSymlink();
|
||||||
|
|
||||||
session_manager.PrepareSession();
|
session_manager.PrepareSession();
|
||||||
|
@ -450,6 +451,7 @@ void App::ProcessRequestThrow()
|
||||||
{
|
{
|
||||||
cur.request->dir_tab.push_back(root_dir);
|
cur.request->dir_tab.push_back(root_dir);
|
||||||
cur.request->last_item = cur.request->dir_tab.back();
|
cur.request->last_item = cur.request->dir_tab.back();
|
||||||
|
cur.mount = system.mounts.CalcCurMount();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -457,8 +459,6 @@ void App::ProcessRequestThrow()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cur.mount = system.mounts.CalcCurMount();
|
|
||||||
|
|
||||||
if( cur.mount->type != system.mounts.MountTypeStatic() )
|
if( cur.mount->type != system.mounts.MountTypeStatic() )
|
||||||
Make();
|
Make();
|
||||||
}
|
}
|
||||||
|
@ -523,6 +523,8 @@ void App::ClearAfterRequest()
|
||||||
html_filtered.clear();
|
html_filtered.clear();
|
||||||
aheader_name.clear();
|
aheader_name.clear();
|
||||||
aheader_value.clear();
|
aheader_value.clear();
|
||||||
|
cur.mount = system.mounts.GetEmptyMount();
|
||||||
|
system.mounts.pmount = cur.mount; // IMPROVE ME system.mounts.pmount will be removed
|
||||||
// send_data_buf doesn't have to be cleared and it is better to not clear it (optimizing)
|
// send_data_buf doesn't have to be cleared and it is better to not clear it (optimizing)
|
||||||
|
|
||||||
log << logendrequest;
|
log << logendrequest;
|
||||||
|
|
Loading…
Reference in New Issue