tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: some more orphans to polish default locale

Browse Source 
added: new options to the config:
  url_proto: default: http://
  url_ssl_proto: default: https://
  use_ssl, use_ssl_static, use_ssl_common (whether or not to use SSL protocol)
  use_ssl_only_for_logged_users
  now we are able to use SSL encryption (https) together with normal connections
removed: config option: base_server




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@755 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2011-08-17 23:09:47 +00:00
parent 3b2a1c3f25
commit ee6500ac65
28 changed files with 363 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/app.cpp
View File

@@ -175,13 +175,14 @@ void App::Close()
bool App::BaseUrlRedirect()
{
if( config.base_url_http_host.empty() )
if( config.base_url.empty() )
return false;
if( Equal(config.base_url_http_host.c_str(), cur.request->env_http_host) )
if( Equal(config.base_url.c_str(), cur.request->env_http_host) )
return false;
cur.request->redirect_to = config.base_url;
system.PutUrlProto(config.use_ssl, cur.request->redirect_to);
cur.request->redirect_to += config.base_url;
AssignString(cur.request->env_request_uri, cur.request->redirect_to, false);
// cur.request->env_request_uri should not be UrlEncoded
cur.request->redirect_url_encoded = true;
@@ -1164,7 +1165,10 @@ sigset_t set;
app->Lock();
app->synchro.was_stop_signal = true;
FCGX_ShutdownPending();
Ezc::WideToUTF8(app->config.base_url, app->url_to_fetch_on_exit);
// here we don't have to use SSL version so we always use config.url_proto
Ezc::WideToUTF8(app->config.url_proto, app->url_to_fetch_on_exit);
Ezc::WideToUTF8(app->config.base_url, app->url_to_fetch_on_exit, false);
app->Unlock();
// this thread will hang on this method