summaryrefslogblamecommitdiff
path: root/www/apache13-modssl/files/patch-ac
blob: a009e6138b065e74a50bc397718616423d86bf1b (plain) (tree)





















                                                                      























                                                           

















                                                                             





















                                                                                 
--- conf/httpd.conf-dist.orig	Wed Mar 24 10:30:16 1999
+++ conf/httpd.conf-dist	Wed Mar 24 10:33:06 1999
@@ -94,8 +94,8 @@
 # these files altogether by using "/dev/null" (for Unix) or
 # "nul" (for Win32) for the arguments to the directives.
 #
-#ResourceConfig conf/srm.conf
-#AccessConfig conf/access.conf
+ResourceConfig /dev/null
+AccessConfig   /dev/null
 
 #
 # Timeout: The number of seconds before receives and sends time out.
@@ -251,7 +251,7 @@
 #  don't use Group #-1 on these systems!
 #
 User nobody
-Group #-1
+Group nobody
 
 #
 # ServerAdmin: Your address, where problems with the server should be
@@ -354,7 +354,22 @@
 # directory index.  Separate multiple entries with spaces.
 #
 <IfModule mod_dir.c>
-    DirectoryIndex index.html
+    <IfModule mod_php3.c>
+        <IfModule mod_php4.c>
+            DirectoryIndex index.php index.php3 index.html
+        </IfModule>
+        <IfModule !mod_php4.c>
+            DirectoryIndex index.php3 index.html
+        </IfModule>
+    </IfModule>
+    <IfModule !mod_php3.c>
+        <IfModule mod_php4.c>
+            DirectoryIndex index.php index.html
+        </IfModule>
+        <IfModule !mod_php4.c>
+            DirectoryIndex index.html
+        </IfModule>
+    </IfModule>
 </IfModule>
 
 #
@@ -469,7 +469,7 @@
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog logs/access_log common
+#CustomLog logs/access_log common
 
 #
 # If you would like to have agent and referer logfiles, uncomment the
@@ -482,7 +482,7 @@
 # If you prefer a single logfile with access, agent, and referer information
 # (Combined Logfile Format) you can use the following directive.
 #
-#CustomLog logs/access_log combined
+CustomLog logs/access_log combined
 
 #
 # Optionally add a line containing the server version and virtual host
@@ -708,13 +723,17 @@
     # For example, the PHP 3.x module (not part of the Apache distribution - see
     # http://www.php.net) will typically use:
     #
-    #AddType application/x-httpd-php3 .php3
-    #AddType application/x-httpd-php3-source .phps
+    <IfModule mod_php3.c>
+        AddType application/x-httpd-php3 .php3
+        AddType application/x-httpd-php3-source .php3s
+    </IfModule>
     #
     # And for PHP 4.x, use:
     #
-    #AddType application/x-httpd-php .php
-    #AddType application/x-httpd-php-source .phps
+    <IfModule mod_php4.c>
+        AddType application/x-httpd-php .php
+        AddType application/x-httpd-php-source .phps
+    </IfModule>
 
     AddType application/x-tar .tgz