<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20683] S60/branches/3.1m/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20683">20683</a></dd>
<dt>Author</dt> <dd>yongjzha</dd>
<dt>Date</dt> <dd>2007-04-03 07:51:14 -0700 (Tue, 03 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>2007-03-27 raalexan <rasvan.alexandrescu@nokia.com>
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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60branches31mWebKitBrowserControlsrcBrCtlcpp">S60/branches/3.1m/WebKit/BrowserControl/src/BrCtl.cpp</a></li>
<li><a href="#S60branches31mWebKitBrowserControlsrcWmlDispatchercpp">S60/branches/3.1m/WebKit/BrowserControl/src/WmlDispatcher.cpp</a></li>
<li><a href="#S60branches31mWebKitChangeLog">S60/branches/3.1m/WebKit/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60branches31mWebKitBrowserControlsrcBrCtlcpp"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/BrowserControl/src/BrCtl.cpp (20682 => 20683)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/BrowserControl/src/BrCtl.cpp 2007-04-03 14:44:40 UTC (rev 20682)
+++ S60/branches/3.1m/WebKit/BrowserControl/src/BrCtl.cpp 2007-04-03 14:51:14 UTC (rev 20683)
</span><span class="lines">@@ -1218,7 +1218,17 @@
</span><span class="cx"> //
</span><span class="cx"> EXPORT_C const TCertInfo* CBrCtl::CertInfo()
</span><span class="cx"> {
</span><del>- return iWebKitControl->CertInfo();
</del><ins>+ const TCertInfo* certInfo = NULL;
+
+ if( WmlMode() )
+ {
+ certInfo = iWmlEngineInterface->CertInfo();
+ }
+ else
+ {
+ certInfo = iWebKitControl->CertInfo();
+ }
+ return certInfo;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // -----------------------------------------------------------------------------
</span></span></pre></div>
<a id="S60branches31mWebKitBrowserControlsrcWmlDispatchercpp"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/BrowserControl/src/WmlDispatcher.cpp (20682 => 20683)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/BrowserControl/src/WmlDispatcher.cpp 2007-04-03 14:44:40 UTC (rev 20682)
+++ S60/branches/3.1m/WebKit/BrowserControl/src/WmlDispatcher.cpp 2007-04-03 14:51:14 UTC (rev 20683)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> TInt status(KErrNone);
</span><span class="cx">
</span><del>- const CUrlResponseHeaderInfo& headerInfo = aResponseInfo.HeaderInfo();
</del><ins>+ CUrlResponseHeaderInfo& headerInfo = aResponseInfo.HeaderInfo();
</ins><span class="cx"> CWebKitLoader& webkitLoader = iBrCtl->WebKitControl()->WebKitView().MainFrame().WebKitBridge().Loader();
</span><span class="cx"> webkitLoader.IncomingContentInfo( aTransactionId, ELoadStarted, ETrue, aResponseInfo );
</span><span class="cx">
</span><span class="lines">@@ -155,6 +155,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> iBrCtl->SetWmlMode(ETrue);
</span><ins>+ //send the certificate info
+ iBrCtl->WmlEngineInterface()->SetCertInfo( headerInfo.CertInfo() );
</ins><span class="cx">
</span><span class="cx"> return status;
</span><span class="cx"> }
</span></span></pre></div>
<a id="S60branches31mWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/branches/3.1m/WebKit/ChangeLog (20682 => 20683)</h4>
<pre class="diff"><span>
<span class="info">--- S60/branches/3.1m/WebKit/ChangeLog 2007-04-03 14:44:40 UTC (rev 20682)
+++ S60/branches/3.1m/WebKit/ChangeLog 2007-04-03 14:51:14 UTC (rev 20683)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2007-03-27 raalexan <rasvan.alexandrescu@nokia.com>
+
+ 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):
+
</ins><span class="cx"> 2007-04-02 hongzhao <set EMAIL_ADDRESS environment variable>
</span><span class="cx">
</span><span class="cx"> Reviewed by yongjun.zhang@nokia.com
</span></span></pre>
</div>
</div>
</body>
</html>