From d8451ceaa0c0d67af6d519b092db43cb14fc5ead Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Fri, 29 May 2015 09:46:29 +0000 Subject: [PATCH] fixed: checking for ssl redirect we should take into account cur.request->function->need_ssl too git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1010 e52654a7-88a9-db11-a3e9-0013d4bc506e --- core/app.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/app.cpp b/core/app.cpp index 5db4ca1..0384356 100644 --- a/core/app.cpp +++ b/core/app.cpp @@ -310,9 +310,11 @@ void App::CheckIfNeedSSLredirect() { if( config.use_ssl_only_for_logged_users ) { + bool function_need_ssl = (cur.request->function && cur.request->function->need_ssl); + if( cur.request->using_ssl ) { - if( !cur.session->puser ) + if( !cur.session->puser && !function_need_ssl ) { log << log3 << "App: this operation should NOT be used through SSL" << logend; BaseUrlRedirect(config.use_ssl_redirect_code, true); @@ -320,7 +322,7 @@ void App::CheckIfNeedSSLredirect() } else { - if( cur.session->puser ) + if( cur.session->puser || function_need_ssl ) { log << log3 << "App: this operation should be used through SSL" << logend; BaseUrlRedirect(config.use_ssl_redirect_code, true);