<!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>[25913] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/25913">25913</a></dd>
<dt>Author</dt> <dd>lars</dd>
<dt>Date</dt> <dd>2007-10-02 01:46:50 -0700 (Tue, 02 Oct 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> The cookies() method should only return the value of the
cookie, not additional info such as the expiration date.
Fixes LayoutTests/fast/cookies/local-file-can-set-cookies.html</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformqtCookieJarQtcpp">trunk/WebCore/platform/qt/CookieJarQt.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (25912 => 25913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-10-02 08:46:41 UTC (rev 25912)
+++ trunk/WebCore/ChangeLog 2007-10-02 08:46:50 UTC (rev 25913)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2007-10-02 Lars Knoll <lars@trolltech.com>
+
+ Reviewed by Olliej.
+
+ The cookies() method should only return the value of the
+ cookie, not additional info such as the expiration date.
+
+ * platform/qt/CookieJarQt.cpp:
+ (WebCore::cookies):
+
</ins><span class="cx"> 2007-10-01 Lars Knoll <lars@trolltech.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Eric.
</span></span></pre></div>
<a id="trunkWebCoreplatformqtCookieJarQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/qt/CookieJarQt.cpp (25912 => 25913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/qt/CookieJarQt.cpp 2007-10-02 08:46:41 UTC (rev 25912)
+++ trunk/WebCore/platform/qt/CookieJarQt.cpp 2007-10-02 08:46:50 UTC (rev 25913)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="lines">@@ -46,7 +46,11 @@
</span><span class="cx"> String cookies(const KURL& url)
</span><span class="cx"> {
</span><span class="cx"> QUrl u((QString)url.url());
</span><del>- return (String)QCookieJar::cookieJar()->cookies(u);
</del><ins>+ QString cookies = QCookieJar::cookieJar()->cookies(u);
+ int idx = cookies.indexOf(QLatin1Char(';'));
+ if (idx > 0)
+ cookies = cookies.left(idx);
+ return cookies;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool cookiesEnabled()
</span></span></pre>
</div>
</div>
</body>
</html>