Changeset 17685 in webkit

Timestamp:

Nov 9, 2006 7:34:54 AM (17 years ago)

Author:

spadma

Message:

2006-11-08 spadma <​Sachin.Padma@nokia.com>

Reviewed by Yongjun.
DESC: PNIO-6T5GMC: When leaving a secure web page, the query "Leaving a secure web page. Continue?" is shown twice
​http://bugs.webkit.org/show_bug.cgi?id=11552

• ResourceLoader/src/HttpLoader.cpp: (CHttpLoader::CheckForSecurityStatusChange):

Location:

S60/trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• ResourceLoader/src/HttpLoader.cpp (modified) (1 diff)

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2006-11-08  spadma  <Sachin.Padma@nokia.com>
+
+        Reviewed by Yongjun.
+        DESC: PNIO-6T5GMC: When leaving a secure web page, the query "Leaving a secure web page. Continue?" is shown twice
+        http://bugs.webkit.org/show_bug.cgi?id=11552
+        * ResourceLoader/src/HttpLoader.cpp:
+        (CHttpLoader::CheckForSecurityStatusChange):
+
 2006-11-08  yaharon  <yael.aharon@nokia.com>
 

S60/trunk/WebKit/ResourceLoader/src/HttpLoader.cpp

@@ -162 +162 @@
   {
   TInt error(KErrNone);
-  TBool secureScheme(EFalse);
+  TBool requestedSecScheme(EFalse);
+  TBool redirectedSecScheme(EFalse);
 
   RHTTPTransaction* httpTrans = ((CHttpTransaction&)aTransaction).HttpTransaction();
-  TUriParser8 uriParser;
-    if(uriParser.Parse( httpTrans->Request().URI().UriDes() ) == KErrNone)
+  TUriParser8 redirectedParser;
+    if(redirectedParser.Parse( httpTrans->Request().URI().UriDes() ) == KErrNone)
     {
         //
-    if( uriParser.Extract( EUriScheme ).Compare( _L8("https") ) == 0 )
-      {
-      secureScheme = ETrue;
+    if( redirectedParser.Extract( EUriScheme ).Compare( _L8("https") ) == 0 )
+      {
+      redirectedSecScheme = ETrue;
       }
     }
+    
+    TUriParser reqParser;
+    if(reqParser.Parse( aTransaction.UrlRequestInfo().Url() ) == KErrNone)
+    {
+        //
+    if( reqParser.Extract( EUriScheme ).Compare( _L("https") ) == 0 )
+      {
+      requestedSecScheme = ETrue;
+      }
+    }
+    
   //When submitting the request iSecurePage was set based on the request url
   //Check the redirect url and see if the scheme has changed
-  if(iSecurePage && !secureScheme) //redirection from a secure page to an unsecure one
+  if(requestedSecScheme && !redirectedSecScheme) //redirection from a secure page to an unsecure one
     {
     error = iHttpLoaderToUiEventListener->AboutToLoadPage( EExitingSecurePage );
     }
-  else if(secureScheme && !iSecurePage) //redirection to unsecurepage when secure page was requested
+  else if(redirectedSecScheme && !requestedSecScheme) //redirection to unsecurepage when secure page was requested
     {
     error = iHttpLoaderToUiEventListener->AboutToLoadPage( EEnteringSecurePage );