[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[eric at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 3f1a844c401f1ff68cf7d84811f3ac45a1c2f405
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 22:12:48 2010 +0000

    2010-01-06  Andras Becsi  <abecsi at inf.u-szeged.hu>
    
            Reviewed by Darin Adler.
    
            Set isHttpdOpen to 0 if pidfile does not exist for some reason.
            Speculative fix for https://bugs.webkit.org/show_bug.cgi?id=33256.
    
            * Scripts/run-webkit-tests:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52869 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 967111c..c81ec33 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Darin Adler.
 
+        Set isHttpdOpen to 0 if pidfile does not exist for some reason.
+        Speculative fix for https://bugs.webkit.org/show_bug.cgi?id=33256.
+
+        * Scripts/run-webkit-tests:
+
+2010-01-06  Andras Becsi  <abecsi at inf.u-szeged.hu>
+
+        Reviewed by Darin Adler.
+
         Change hardcoded /tmp in run-webkit-tests to File::Spec->tmpdir(),
         and remove the httpd's pidfile directory if httpd terminated.
 
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 4041bf8..b3ea274 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -1434,7 +1434,11 @@ sub closeHTTPD()
     close HTTPDIN;
     close HTTPDOUT;
 
-    return unless -f $httpdPidFile;
+    if (! -f $httpdPidFile) {
+        $isHttpdOpen = 0;
+        rmdir $httpdPidDir;
+        return;
+    }
 
     my $httpdPid = `cat "$httpdPidFile"`;
     kill 15, $httpdPid;

-- 
WebKit Debian packaging