<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[31476] branches/Safari-3-1-branch</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/31476">31476</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2008-03-31 14:30:42 -0700 (Mon, 31 Mar 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge r31434.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesSafari31branchLayoutTestsChangeLog">branches/Safari-3-1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchesSafari31branchWebCoreChangeLog">branches/Safari-3-1-branch/WebCore/ChangeLog</a></li>
<li><a href="#branchesSafari31branchWebCoreplatformnetworkResourceHandlecpp">branches/Safari-3-1-branch/WebCore/platform/network/ResourceHandle.cpp</a></li>
<li><a href="#branchesSafari31branchWebCoreplatformnetworkResourceHandleInternalh">branches/Safari-3-1-branch/WebCore/platform/network/ResourceHandleInternal.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchesSafari31branchLayoutTestsfastloadercancelloadduringportblocktimerexpectedtxt">branches/Safari-3-1-branch/LayoutTests/fast/loader/cancel-load-during-port-block-timer-expected.txt</a></li>
<li><a href="#branchesSafari31branchLayoutTestsfastloadercancelloadduringportblocktimerhtml">branches/Safari-3-1-branch/LayoutTests/fast/loader/cancel-load-during-port-block-timer.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesSafari31branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-3-1-branch/LayoutTests/ChangeLog (31475 => 31476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-1-branch/LayoutTests/ChangeLog 2008-03-31 21:27:44 UTC (rev 31475)
+++ branches/Safari-3-1-branch/LayoutTests/ChangeLog 2008-03-31 21:30:42 UTC (rev 31476)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2008-03-31 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><ins>+ Merge r31434 to Safari-3-1-branch.
+
+ 2008-03-29 Sam Weinig <sam@webkit.org>
+
+ Reviewed by Brady Eidson.
+
+ Test for crash when canceling a resource load while port blocked failure
+ timer is going
+
+ * fast/loader/cancel-load-during-port-block-timer-expected.txt: Added.
+ * fast/loader/cancel-load-during-port-block-timer.html: Added.
+
+2008-03-31 Mark Rowe <mrowe@apple.com>
+
</ins><span class="cx"> Merge r30722 to Safari-3-1-branch.
</span><span class="cx">
</span><span class="cx"> 2008-03-03 Mark Rowe <mrowe@apple.com>
</span></span></pre></div>
<a id="branchesSafari31branchLayoutTestsfastloadercancelloadduringportblocktimerexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/Safari-3-1-branch/LayoutTests/fast/loader/cancel-load-during-port-block-timer-expected.txt (0 => 31476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-1-branch/LayoutTests/fast/loader/cancel-load-during-port-block-timer-expected.txt (rev 0)
+++ branches/Safari-3-1-branch/LayoutTests/fast/loader/cancel-load-during-port-block-timer-expected.txt 2008-03-31 21:30:42 UTC (rev 31476)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+If this does crash, the test has passed.
</ins></span></pre></div>
<a id="branchesSafari31branchLayoutTestsfastloadercancelloadduringportblocktimerhtml"></a>
<div class="addfile"><h4>Added: branches/Safari-3-1-branch/LayoutTests/fast/loader/cancel-load-during-port-block-timer.html (0 => 31476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-1-branch/LayoutTests/fast/loader/cancel-load-during-port-block-timer.html (rev 0)
+++ branches/Safari-3-1-branch/LayoutTests/fast/loader/cancel-load-during-port-block-timer.html 2008-03-31 21:30:42 UTC (rev 31476)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<script>
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+ layoutTestController.setCanOpenWindows();
+ layoutTestController.setCloseRemainingWindowsWhenComplete();
+ }
+
+ window.open("http://webkit.org:22").document.write('');
+
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+</script>
+If this does crash, the test has passed.
</ins></span></pre></div>
<a id="branchesSafari31branchWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-3-1-branch/WebCore/ChangeLog (31475 => 31476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-1-branch/WebCore/ChangeLog 2008-03-31 21:27:44 UTC (rev 31475)
+++ branches/Safari-3-1-branch/WebCore/ChangeLog 2008-03-31 21:30:42 UTC (rev 31476)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2008-03-31 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><ins>+ Merge r31434 to Safari-3-1-branch.
+
+ 2008-03-29 Sam Weinig <sam@webkit.org>
+
+ Reviewed by Brady Eidson.
+
+ Fix crash when canceling a resource load while port blocked failure
+ timer is going.
+
+ Test: fast/loader/cancel-load-during-port-block-timer.html
+
+ * platform/network/ResourceHandle.cpp:
+ (WebCore::ResourceHandle::scheduleBlockedFailure):
+ (WebCore::ResourceHandle::fireBlockedFailure):
+ * platform/network/ResourceHandleInternal.h:
+ (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+ Make the Timer a member variable of ResourceHandleInternal so
+ that it can be canceled if the ResourceHandle is destroyed.
+
+2008-03-31 Mark Rowe <mrowe@apple.com>
+
</ins><span class="cx"> Merge r30722 to Safari-3-1-branch.
</span><span class="cx">
</span><span class="cx"> 2008-03-03 Mark Rowe <mrowe@apple.com>
</span></span></pre></div>
<a id="branchesSafari31branchWebCoreplatformnetworkResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: branches/Safari-3-1-branch/WebCore/platform/network/ResourceHandle.cpp (31475 => 31476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-1-branch/WebCore/platform/network/ResourceHandle.cpp 2008-03-31 21:27:44 UTC (rev 31475)
+++ branches/Safari-3-1-branch/WebCore/platform/network/ResourceHandle.cpp 2008-03-31 21:30:42 UTC (rev 31476)
</span><span class="lines">@@ -58,15 +58,13 @@
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::scheduleBlockedFailure()
</span><span class="cx"> {
</span><del>- Timer<ResourceHandle>* blockedTimer = new Timer<ResourceHandle>(this, &ResourceHandle::fireBlockedFailure);
- blockedTimer->startOneShot(0);
</del><ins>+ d->m_failureTimer.startOneShot(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceHandle::fireBlockedFailure(Timer<ResourceHandle>* timer)
</span><span class="cx"> {
</span><span class="cx"> if (client())
</span><span class="cx"> client()->wasBlocked(this);
</span><del>- delete timer;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceHandleClient* ResourceHandle::client() const
</span></span></pre></div>
<a id="branchesSafari31branchWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: branches/Safari-3-1-branch/WebCore/platform/network/ResourceHandleInternal.h (31475 => 31476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-1-branch/WebCore/platform/network/ResourceHandleInternal.h 2008-03-31 21:27:44 UTC (rev 31475)
+++ branches/Safari-3-1-branch/WebCore/platform/network/ResourceHandleInternal.h 2008-03-31 21:30:42 UTC (rev 31476)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "AuthenticationChallenge.h"
</span><ins>+#include "Timer.h"
</ins><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #include <CFNetwork/CFURLConnectionPriv.h>
</span><span class="lines">@@ -37,7 +38,6 @@
</span><span class="cx"> #if USE(WININET)
</span><span class="cx"> #include <winsock2.h>
</span><span class="cx"> #include <windows.h>
</span><del>-#include "Timer.h"
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CURL)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx"> #elif USE(CFNETWORK)
</span><span class="cx"> , m_currentCFChallenge(0)
</span><span class="cx"> #endif
</span><ins>+ , m_failureTimer(loader, &ResourceHandle::fireBlockedFailure)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,6 +176,8 @@
</span><span class="cx"> CFURLAuthChallengeRef m_currentCFChallenge;
</span><span class="cx"> #endif
</span><span class="cx"> AuthenticationChallenge m_currentWebChallenge;
</span><ins>+
+ Timer<ResourceHandle> m_failureTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>