Title: [203885] branches/safari-602-branch/Tools
Revision
203885
Author
bshaf...@apple.com
Date
2016-07-29 00:12:39 -0700 (Fri, 29 Jul 2016)

Log Message

Merge r203755. rdar://problem/23325160

Modified Paths

Diff

Modified: branches/safari-602-branch/Tools/ChangeLog (203884 => 203885)


--- branches/safari-602-branch/Tools/ChangeLog	2016-07-29 07:12:37 UTC (rev 203884)
+++ branches/safari-602-branch/Tools/ChangeLog	2016-07-29 07:12:39 UTC (rev 203885)
@@ -1,5 +1,18 @@
 2016-07-28  Babak Shafiei  <bshaf...@apple.com>
 
+        Merge r203755. rdar://problem/23325160
+
+    2016-07-26  Alex Christensen  <achristen...@webkit.org>
+
+            Fix tests after r203743.
+            https://bugs.webkit.org/show_bug.cgi?id=156947
+
+            * WebKitTestRunner/TestController.cpp:
+            (WTR::TestController::resetStateToConsistentValues):
+            Reset the new boolean m_rejectsProtectionSpaceAndContinueForAuthenticationChallenges.
+
+2016-07-28  Babak Shafiei  <bshaf...@apple.com>
+
         Merge r203743. rdar://problem/23325160
 
     2016-07-26  David Kilzer <ddkil...@apple.com>

Modified: branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp (203884 => 203885)


--- branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp	2016-07-29 07:12:37 UTC (rev 203884)
+++ branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp	2016-07-29 07:12:39 UTC (rev 203885)
@@ -772,6 +772,7 @@
 
     m_workQueueManager.clearWorkQueue();
 
+    m_rejectsProtectionSpaceAndContinueForAuthenticationChallenges = false;
     m_handlesAuthenticationChallenges = false;
     m_authenticationUsername = String();
     m_authenticationPassword = String();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to