forked from Lainports/freebsd-ports
77 lines
2.4 KiB
Text
77 lines
2.4 KiB
Text
--- conf/httpd.conf-dist.orig Tue Nov 6 11:37:00 2001
|
|
+++ conf/httpd.conf-dist Tue Nov 6 11:37:59 2001
|
|
@@ -92,8 +92,8 @@
|
|
# server ignore 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.
|
|
@@ -383,7 +383,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>
|
|
|
|
#
|
|
@@ -503,7 +518,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
|
|
@@ -516,7 +531,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
|
|
@@ -793,13 +808,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
|
|
|