[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[rniwa at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 4455fee3ac12b817f2942b7539a6b5ca73369fd8
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 19:11:53 2011 +0000

    2011-01-27  Charlie Reis  <creis at chromium.org>
    
            Reviewed by Mihai Parparita.
    
            back-during-onload-hung-page.php causes Chromium WebKit bot to fail
            https://bugs.webkit.org/show_bug.cgi?id=53220
    
            Reduces the timeout on a script that shouldn't finish during a test.
            This avoids problems in one of the Chromium WebKit builders.
    
            * http/tests/history/resources/back-during-onload-hung-page.php: Reduce timeout.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76816 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 302d43d..540e822 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-27  Charlie Reis  <creis at chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        back-during-onload-hung-page.php causes Chromium WebKit bot to fail
+        https://bugs.webkit.org/show_bug.cgi?id=53220
+
+        Reduces the timeout on a script that shouldn't finish during a test.
+        This avoids problems in one of the Chromium WebKit builders.
+
+        * http/tests/history/resources/back-during-onload-hung-page.php: Reduce timeout.
+
 2011-01-26  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/LayoutTests/http/tests/history/resources/back-during-onload-hung-page.php b/LayoutTests/http/tests/history/resources/back-during-onload-hung-page.php
index 6031615..7892db3 100644
--- a/LayoutTests/http/tests/history/resources/back-during-onload-hung-page.php
+++ b/LayoutTests/http/tests/history/resources/back-during-onload-hung-page.php
@@ -1,2 +1,2 @@
-<? sleep(1000); ?>
+<? sleep(60); ?>
 FAIL: Should never see this
\ No newline at end of file

-- 
WebKit Debian packaging