diff -r c711bdda59f4 -r ac77f89b1d9e webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp Wed Mar 31 23:16:40 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp Wed Apr 14 17:06:56 2010 +0300 @@ -1174,15 +1174,17 @@ //When submitting the request iSecurePage was set based on the request url //Check the redirect url and see if the scheme has changed HttpSessionManager* httpSessionMgr = StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager(); - if(requestedSecScheme && !redirectedSecScheme) //redirection from a secure page to an unsecure one + if(httpSessionMgr->isInSecureConnection() && requestedSecScheme && !redirectedSecScheme) //redirection from a secure page to an unsecure one { error = httpSessionMgr->uiCallback()->aboutToLoadPage(control(m_frame), HttpUiCallbacks::EExitingSecurePage); + httpSessionMgr->setInSecureConnection(EFalse); } - else if(redirectedSecScheme && !requestedSecScheme) //redirection to unsecurepage when secure page was requested + else if(!httpSessionMgr->isInSecureConnection() && redirectedSecScheme && !requestedSecScheme) //redirection to unsecurepage when secure page was requested { error = httpSessionMgr->uiCallback()->aboutToLoadPage(control(m_frame), HttpUiCallbacks::EEnteringSecurePage ); + httpSessionMgr->setInSecureConnection(ETrue); } - } + } return error; }