diff options
| author | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2008-09-30 03:13:43 +0000 |
|---|---|---|
| committer | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2008-09-30 03:13:43 +0000 |
| commit | 250abc5bd1e8b320cc5d8ec4d71700a4a2350357 (patch) | |
| tree | 52ec583e4860682ead6d5395af778f981f0ca73c /www/apache13+ipv6/files/patch-ag | |
| parent | This module is the Sybase extensions to Ruby. (diff) | |
- Don't check value for WITH_/WITHOUT_ vars, especially for "yes"
Just relay on they are set.
- sync with www/apache13.
PR: 127464
Notes
Notes:
svn path=/head/; revision=221014
Diffstat (limited to 'www/apache13+ipv6/files/patch-ag')
| -rw-r--r-- | www/apache13+ipv6/files/patch-ag | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/www/apache13+ipv6/files/patch-ag b/www/apache13+ipv6/files/patch-ag index 58c60812aa88..58ef46c45c2f 100644 --- a/www/apache13+ipv6/files/patch-ag +++ b/www/apache13+ipv6/files/patch-ag @@ -1,24 +1,24 @@ ---- conf/httpd.conf-dist.orig Wed Jan 9 19:05:31 2002 -+++ conf/httpd.conf-dist Fri Jan 25 07:59:12 2002 +--- conf/httpd.conf-dist.old 2004-11-24 22:10:19.000000000 +0300 ++++ conf/httpd.conf-dist 2008-07-19 18:42:27.000000000 +0400 @@ -356,7 +356,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> ++ DirectoryIndex index.php3 index.html + </IfModule> + <IfModule !mod_php3.c> + <IfModule mod_php4.c> + DirectoryIndex index.php index.html + </IfModule> + <IfModule !mod_php4.c> -+ DirectoryIndex index.html ++ <IfModule mod_php5.c> ++ DirectoryIndex index.php index.html ++ </IfModule> ++ <IfModule !mod_php5.c> ++ DirectoryIndex index.html ++ </IfModule> + </IfModule> + </IfModule> </IfModule> @@ -42,12 +42,10 @@ # # Optionally add a line containing the server version and virtual host -@@ -759,6 +774,15 @@ - # - <IfModule mod_negotiation.c> +@@ -746,6 +761,19 @@ LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw -+ </IfModule> -+ + </IfModule> + + <IfModule mod_php3.c> + AddType application/x-httpd-php3 .php3 + AddType application/x-httpd-php3-source .php3s @@ -55,6 +53,12 @@ + <IfModule mod_php4.c> + AddType application/x-httpd-php .php + AddType application/x-httpd-php-source .phps - </IfModule> - ++ </IfModule> ++ <IfModule mod_php5.c> ++ AddType application/x-httpd-php .php ++ AddType application/x-httpd-php-source .phps ++ </IfModule> ++ # + # AddType allows you to tweak mime.types without actually editing it, or to + # make certain files to be certain types. |