Submit the server default values

This commit is contained in:
Martin Raiber 2012-08-25 20:02:24 +02:00
parent 969a0bba8c
commit ee9ef2bb25
3 changed files with 22 additions and 3 deletions

View File

@ -201,7 +201,7 @@ unsigned int CSessionMgr::TimeoutSessions(void)
ret=(std::max)(diff, ret);
}
}
return (unsigned int)((SESSION_TIMEOUT_S)*1000)-ret+10;
return (unsigned int)((SESSION_TIMEOUT_S)*1000)-ret+1000;
}
void CSessionMgr::operator()(void)

View File

@ -21,6 +21,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server", "CompiledServer.vc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptoplugin", "cryptoplugin\cryptoplugin.vcxproj", "{A9B12FBF-84D8-4BB6-B4A3-DD57F06637B0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpserver", "httpserver\httpserver.vcxproj", "{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -195,6 +197,23 @@ Global
{A9B12FBF-84D8-4BB6-B4A3-DD57F06637B0}.Release|Win32.Build.0 = Release|Win32
{A9B12FBF-84D8-4BB6-B4A3-DD57F06637B0}.Release|x64.ActiveCfg = Release|x64
{A9B12FBF-84D8-4BB6-B4A3-DD57F06637B0}.Release|x64.Build.0 = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Debug|Win32.ActiveCfg = Debug|Win32
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Debug|Win32.Build.0 = Debug|Win32
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Debug|x64.ActiveCfg = Debug|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Debug|x64.Build.0 = Debug|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release Server PreVista|Win32.ActiveCfg = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release Server PreVista|x64.ActiveCfg = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release Server PreVista|x64.Build.0 = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release Service|Win32.ActiveCfg = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release Service|x64.ActiveCfg = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release Service|x64.Build.0 = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release x64|Win32.ActiveCfg = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release x64|x64.ActiveCfg = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release x64|x64.Build.0 = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release|Win32.ActiveCfg = Release|Win32
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release|Win32.Build.0 = Release|Win32
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release|x64.ActiveCfg = Release|x64
{D1BF1BE4-1F36-4E19-8631-CB4C93B77E9B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -1021,7 +1021,7 @@ void ClientConnector::updateSettings(const std::string &pData)
new_settings_str+=key+L"="+nv+L"\n";
mod=true;
}
else if(new_settings->getValue(key+L"_def", &nv) )
if(new_settings->getValue(key+L"_def", &nv) )
{
new_settings_str+=key+L"_def="+nv+L"\n";
mod=true;
@ -1041,7 +1041,7 @@ void ClientConnector::updateSettings(const std::string &pData)
new_settings_str+=key+L"="+nv+L"\n";
mod=true;
}
else if(new_settings->getValue(key+L"_def", &nv) )
if(new_settings->getValue(key+L"_def", &nv) )
{
new_settings_str+=key+L"_def="+nv+L"\n";
mod=true;