Don't try to use an SSL certificate on Windows until <rdar://problem/5345985> is...

Reviewed by Mark.

* Scripts/run-webkit-httpd:
* Scripts/run-webkit-tests:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a2492662304c09472948c03f487637a45c556da9..dff9eaba3a317b6f13e7065ba003757cf1a58071 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-18  Adam Roben  <aroben@apple.com>
+
+        Don't try to use an SSL certificate on Windows until <rdar://problem/5345985> is fixed
+
+        Reviewed by Mark.
+
+        * Scripts/run-webkit-httpd:
+        * Scripts/run-webkit-tests:
+
 2007-07-18  Adam Roben  <aroben@apple.com>
 
         More git friendliness for prepare-ChangeLog

diff --git a/WebKitTools/Scripts/run-webkit-httpd b/WebKitTools/Scripts/run-webkit-httpd
index a5ee441829ac0706ce7fd0724b59af6dff9ca1d1..ce5a5aa152e0c8438d3f6ea81f8b653232bb963a 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-httpd
+++ b/WebKitTools/Scripts/run-webkit-httpd
@@ -100,11 +100,10 @@ if ($allInterfaces) {
 }
 print "Press Ctrl+C to stop it.\n\n";
 
-system($httpdPath, 
+my @args = (
     "-f", "$httpdConfig",
     "-C", "DocumentRoot \"$documentRoot\"",
     "-C", "Listen $listen",
-    "-c", "SSLCertificateFile $sslCertificate",
     "-c", "TypesConfig \"$typesConfig\"",
     "-c", "CustomLog |/usr/bin/tee common",
     "-c", "ErrorLog |/usr/bin/tee",
@@ -114,6 +113,12 @@ system($httpdPath,
     "-X",
     # Disable Keep-Alive support. Makes testing in multiple browsers easier (no need to wait
     # for another browser's connection to expire).
-    "-c", "KeepAlive 0");
+    "-c", "KeepAlive 0"
+);
+
+# FIXME: Enable this on Windows once <rdar://problem/5345985> is fixed
+push(@args, "-c", "SSLCertificateFile $sslCertificate") unless isCygwin();
+
+system($httpdPath, @args);
 
 unlink "/tmp/WebKit/httpd.pid";

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 03add0d345420811fc0d69c76c49e156d0d978c1..e4a36016c85c6636b8f0a3ad0f9ca14be80af53a 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -1147,16 +1147,21 @@ sub openHTTPDIfNeeded()
 
     mkpath $absTestResultsDirectory;
 
-    open2(\*HTTPDIN, \*HTTPDOUT, $httpdPath, 
+    my @args = (
         "-f", "$httpdConfig",
         "-C", "DocumentRoot \"$documentRoot\"",
         "-C", "Listen $listen",
-        "-c", "SSLCertificateFile $sslCertificate",
         "-c", "TypesConfig \"$typesConfig\"",
         "-c", "CustomLog \"$absTestResultsDirectory/access_log.txt\" common",
         "-c", "ErrorLog \"$absTestResultsDirectory/error_log.txt\"",
         # Apache wouldn't run CGIs with permissions==700 otherwise
-        "-c", "User \"#$<\"");
+        "-c", "User \"#$<\""
+    );
+
+    # FIXME: Enable this on Windows once <rdar://problem/5345985> is fixed
+    push(@args, "-c", "SSLCertificateFile $sslCertificate") unless isCygwin();
+
+    open2(\*HTTPDIN, \*HTTPDOUT, $httpdPath, @args);
 
     my $retryCount = 20;
     while (system("/usr/bin/curl -q --silent --stderr - --output /dev/null $listen") && $retryCount) {