Adds an event loop abstraction to platform. This abstraction will be

[WebKit-https.git] / LayoutTests / http / conf / httpd.conf

diff --git a/LayoutTests/http/conf/httpd.conf b/LayoutTests/http/conf/httpd.conf
index a2b7df0..da687ea 100644 (file)
--- a/LayoutTests/http/conf/httpd.conf
+++ b/LayoutTests/http/conf/httpd.conf
@@ -71,7 +71,7 @@ ServerRoot "/usr"
 # DISK. The PID of the main server process is automatically appended to
 # the filename. 
 #
-#LockFile "/private/var/run/httpd.lock"
+LockFile "/tmp/WebKit/httpd.lock"
 
 #
 # PidFile: The file in which the server should record its process
@@ -176,9 +176,11 @@ MaxRequestsPerChild 100000
 # directive.
 #
 # Configured from the httpd command line for WebKit layout tests.
+# Port 8443 is hard-coded as it is needed for the HTTPS configuration later on.
 #
 #Listen 3000
-#Listen 127.0.0.1:8000
+Listen 127.0.0.1:8080
+Listen 127.0.0.1:8443
 
 #
 # Dynamic Shared Object (DSO) Support
@@ -229,7 +231,7 @@ LoadModule headers_module     libexec/httpd/mod_headers.so
 #LoadModule unique_id_module   libexec/httpd/mod_unique_id.so
 #LoadModule setenvif_module    libexec/httpd/mod_setenvif.so
 #LoadModule dav_module         libexec/httpd/libdav.so
-#LoadModule ssl_module         libexec/httpd/libssl.so
+LoadModule ssl_module         libexec/httpd/libssl.so
 #LoadModule perl_module        libexec/httpd/libperl.so
 LoadModule php4_module        libexec/httpd/libphp4.so
 LoadModule hfs_apple_module   libexec/httpd/mod_hfs_apple.so
@@ -273,7 +275,7 @@ AddModule mod_headers.c
 AddModule mod_so.c
 #AddModule mod_setenvif.c
 #AddModule mod_dav.c
-#AddModule mod_ssl.c
+AddModule mod_ssl.c
 #AddModule mod_perl.c
 AddModule mod_php4.c
 AddModule mod_hfs_apple.c
@@ -441,7 +443,8 @@ HostnameLookups Off
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog "/tmp/WebKit/error_log"
+# Configured from the httpd command line for WebKit layout tests.
+#ErrorLog "/tmp/layout-test-results/error_log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -466,13 +469,14 @@ LogFormat "%{User-agent}i" agent
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog "/tmp/WebKit/access_log" common
+# Configured from the httpd command line for WebKit layout tests.
+#CustomLog "/tmp/layout-test-results/access_log" common
 
 #
 # If you prefer a single logfile with access, agent, and referer information
 # (Combined Logfile Format) you can use the following directive.
 #
-#CustomLog "/private/var/log/httpd/access_log" combined
+#CustomLog "/tmp/layout-test-results/access_log" combined
 
 #
 # Optionally add a line containing the server version and virtual host
@@ -607,7 +611,7 @@ ServerSignature On
     #
     # To use CGI scripts:
     #
-    AddHandler cgi-script .cgi
+    AddHandler cgi-script .cgi .pl
 
     #
     # To use server-parsed HTML files
@@ -619,7 +623,7 @@ ServerSignature On
     # Uncomment the following line to enable Apache's send-asis HTTP file
     # feature
     #
-    #AddHandler send-as-is asis
+    AddHandler send-as-is asis
 
     #
     # If you wish to use server-parsed imagemap files, use
@@ -727,3 +731,8 @@ ServerSignature On
     RewriteCond %{REQUEST_METHOD} ^TRACE
     RewriteRule .* - [F]
 </IfModule>
+
+<VirtualHost 127.0.0.1:8443>
+    ServerName 127.0.0.1
+    SSLEngine On
+</VirtualHost>