Changeset 20859 for S60/trunk/WebKit

Show
Ignore:
Timestamp:
04/12/07 07:53:10 (21 months ago)
Author:
yongjzha
Message:

raalexan, reviewed by Yongjun

DESC: Connection shown as Normal in secure page
http://bugs.webkit.org/show_bug.cgi?id=13206
TSW ID: HMNN-6ZGH6J

  • BrowserControl/src/BrCtl.cpp: (CBrCtl::CertInfo):
  • BrowserControl/src/WmlDispatcher.cpp: (CWmlDispatcher::HeadersL):
Location:
S60/trunk/WebKit
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • S60/trunk/WebKit/BrowserControl/src/BrCtl.cpp

    r20825 r20859  
    12561256EXPORT_C const TCertInfo* CBrCtl::CertInfo() 
    12571257    { 
    1258     return iWebKitControl->CertInfo(); 
     1258    const TCertInfo* certInfo = NULL; 
     1259 
     1260    if( WmlMode() ) 
     1261        { 
     1262        certInfo = iWmlEngineInterface->CertInfo(); 
     1263        } 
     1264    else 
     1265        { 
     1266        certInfo = iWebKitControl->CertInfo(); 
     1267        } 
     1268    return certInfo; 
    12591269    } 
    12601270 

  • S60/trunk/WebKit/BrowserControl/src/WmlDispatcher.cpp

    r17942 r20859  
    156156     
    157157    iBrCtl->SetWmlMode(ETrue); 
     158    //send the certificate info 
     159    iBrCtl->WmlEngineInterface()->SetCertInfo( headerInfo.CertInfo() ); 
    158160 
    159161    return status; 

  • S60/trunk/WebKit/ChangeLog

    r20829 r20859  
     1raalexan, reviewed by Yongjun 
     2 DESC: Connection shown as Normal in secure page 
     3 http://bugs.webkit.org/show_bug.cgi?id=13206 
     4 TSW ID: HMNN-6ZGH6J 
     5 
     6        * BrowserControl/src/BrCtl.cpp: 
     7        (CBrCtl::CertInfo): 
     8        * BrowserControl/src/WmlDispatcher.cpp: 
     9        (CWmlDispatcher::HeadersL): 
     10 
    111bradley, reviewed by super mario  
    212 DESC: remove rendundant include to save a warning :)