equal
deleted
inserted
replaced
1172 } |
1172 } |
1173 } |
1173 } |
1174 //When submitting the request iSecurePage was set based on the request url |
1174 //When submitting the request iSecurePage was set based on the request url |
1175 //Check the redirect url and see if the scheme has changed |
1175 //Check the redirect url and see if the scheme has changed |
1176 HttpSessionManager* httpSessionMgr = StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager(); |
1176 HttpSessionManager* httpSessionMgr = StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager(); |
1177 if(requestedSecScheme && !redirectedSecScheme) //redirection from a secure page to an unsecure one |
1177 if(httpSessionMgr->isInSecureConnection() && requestedSecScheme && !redirectedSecScheme) //redirection from a secure page to an unsecure one |
1178 { |
1178 { |
1179 error = httpSessionMgr->uiCallback()->aboutToLoadPage(control(m_frame), HttpUiCallbacks::EExitingSecurePage); |
1179 error = httpSessionMgr->uiCallback()->aboutToLoadPage(control(m_frame), HttpUiCallbacks::EExitingSecurePage); |
1180 } |
1180 httpSessionMgr->setInSecureConnection(EFalse); |
1181 else if(redirectedSecScheme && !requestedSecScheme) //redirection to unsecurepage when secure page was requested |
1181 } |
|
1182 else if(!httpSessionMgr->isInSecureConnection() && redirectedSecScheme && !requestedSecScheme) //redirection to unsecurepage when secure page was requested |
1182 { |
1183 { |
1183 error = httpSessionMgr->uiCallback()->aboutToLoadPage(control(m_frame), HttpUiCallbacks::EEnteringSecurePage ); |
1184 error = httpSessionMgr->uiCallback()->aboutToLoadPage(control(m_frame), HttpUiCallbacks::EEnteringSecurePage ); |
1184 } |
1185 httpSessionMgr->setInSecureConnection(ETrue); |
1185 } |
1186 } |
|
1187 } |
1186 return error; |
1188 return error; |
1187 } |
1189 } |
1188 |
1190 |
1189 // ----------------------------------------------------------------------------- |
1191 // ----------------------------------------------------------------------------- |
1190 // HttpConnection::CheckForNonHttpRedirect |
1192 // HttpConnection::CheckForNonHttpRedirect |