diff options
| author | Dirk Froemberg <dirk@FreeBSD.org> | 2000-05-29 19:22:22 +0000 |
|---|---|---|
| committer | Dirk Froemberg <dirk@FreeBSD.org> | 2000-05-29 19:22:22 +0000 |
| commit | 8f5e68fedd1bb7fa96b4ede28f2e2d772993fb0a (patch) | |
| tree | 9723525955f794fbb02b1c86d91a7e872b4a4702 /www/apache20/files | |
| parent | Update to version 1.94.5. (diff) | |
Add appropriate AddType and DirectoryIndex in preparation for
mod_php[34].
Approved by: ache (maintainer)
Notes
Notes:
svn path=/head/; revision=28933
Diffstat (limited to 'www/apache20/files')
| -rw-r--r-- | www/apache20/files/patch-ag | 54 |
1 files changed, 50 insertions, 4 deletions
diff --git a/www/apache20/files/patch-ag b/www/apache20/files/patch-ag index 436f8f3f7d95..80373fbcca63 100644 --- a/www/apache20/files/patch-ag +++ b/www/apache20/files/patch-ag @@ -1,6 +1,30 @@ ---- conf/httpd.conf-dist.orig Thu May 6 00:17:59 1999 -+++ conf/httpd.conf-dist Fri Sep 3 15:42:56 1999 -@@ -467,7 +467,7 @@ +--- 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 @@ # define per-<VirtualHost> access logfiles, transactions will be # logged therein and *not* in this file. # @@ -9,7 +33,7 @@ # # If you would like to have agent and referer logfiles, uncomment the -@@ -480,7 +480,7 @@ +@@ -486,7 +501,7 @@ # If you prefer a single logfile with access, agent, and referer information # (Combined Logfile Format) you can use the following directive. # @@ -18,3 +42,25 @@ # # 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 + |