Changeset 19916 in webkit


Ignore:
Timestamp:
Feb 28, 2007 2:23:05 PM (17 years ago)
Author:
brmorris
Message:

yinxcai, reviewed by <Yongjun>

DESC: TMCN-6Y9Q7A --Browser ask permission for unsecure item load repeatedly
http://bugs.webkit.org/show_bug.cgi?id=12901

Location:
S60/trunk/WebKit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • S60/trunk/WebKit/ChangeLog

    r19915 r19916  
     1yinxcai, reviewed by <Yongjun>
     2 DESC: TMCN-6Y9Q7A --Browser ask permission for unsecure item load repeatedly
     3 http://bugs.webkit.org/show_bug.cgi?id=12901
     4
     5        * ResourceLoader/inc/HttpLoader.h:
     6        * ResourceLoader/src/HttpLoader.cpp:
     7        (CHttpLoader::CHttpLoader):
     8        (CHttpLoader::CheckSecurityStatus):
     9        (CHttpLoader::RequestL):
     10
    111yinxcai, reviewed by <Sachin>
    212 DESC: merge of r19914 to s60/turnk: Browser may crash when selecting No for secure connections HMNN-6YLEHJ
  • S60/trunk/WebKit/ResourceLoader/inc/HttpLoader.h

    r19915 r19916  
    286286        //
    287287        TBool                               iSecurePage;
     288
     289        //flag for whether a confirm dialog has shown or not.
     290        TBool iConfirmDialogShown;
    288291    };
    289292
  • S60/trunk/WebKit/ResourceLoader/src/HttpLoader.cpp

    r19915 r19916  
    103103    {
    104104    iAuthTransList.Reset();
     105    iConfirmDialogShown = -1;
    105106    }
    106107
     
    234235        if(iSecurePage && !aSecureScheme)
    235236            {
    236             error = iHttpLoaderToUiEventListener->AboutToLoadPage( ESomeItemsNotSecure );
     237            if (iConfirmDialogShown == -1)
     238                {
     239                // First time, show dialog. User may answer "yes" or "no", remember it
     240                iConfirmDialogShown = iHttpLoaderToUiEventListener->AboutToLoadPage( ESomeItemsNotSecure );
     241                }
     242            else
     243                {// we has already shown the dialog, not show again
     244                return iConfirmDialogShown;
     245                }
    237246            }
    238247        else if(!iSecurePage && aSecureScheme)
    239248            {
    240             error = iHttpLoaderToUiEventListener->AboutToLoadPage( ESecureItemInNonSecurePage );
     249            if (iConfirmDialogShown == -1)
     250                {
     251                // First time, show dialog. User may answer "yes" or "no", remember it
     252                iConfirmDialogShown = iHttpLoaderToUiEventListener->AboutToLoadPage( ESecureItemInNonSecurePage );
     253                }
     254            else
     255                {// we has already shown the dialog, not show again
     256                return iConfirmDialogShown;
     257                }
    241258            }
    242259        }
     
    345362    if( aRequestInfo && aRequestInfo->TopLevel() )
    346363        {
     364        //clear flag
     365        iConfirmDialogShown = -1;
     366
    347367        if( iDownloadObserver && iDownloadObserver->FindDownloadL( aRequestInfo->Url() ) )
    348368            {
Note: See TracChangeset for help on using the changeset viewer.