2000-05-29 19:22:22 +00:00
|
|
|
--- conf/httpd.conf-dist.orig Mon Feb 21 08:30:46 2000
|
|
|
|
+++ conf/httpd.conf-dist Mon May 29 16:48:49 2000
|
|
|
|
@@ -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>
|
|
|
|
|
|
|
|
#
|
|
|
|
@@ -473,7 +488,7 @@
|
1999-01-15 00:26:29 +00:00
|
|
|
# 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
|
2000-05-29 19:22:22 +00:00
|
|
|
@@ -486,7 +501,7 @@
|
1999-01-15 00:26:29 +00:00
|
|
|
# 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
|
2000-05-29 19:22:22 +00:00
|
|
|
@@ -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
|
|
|
|
|