diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2000-11-15 16:10:38 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2000-11-15 16:10:38 +0000 |
| commit | 7102926a312e7d8f1dd4018bc1d54bf7aac7410e (patch) | |
| tree | 221bb0cadfb9c0c42fb670bedb3b5ffa95d321bb /www/apache13-modssl/files/patch-ac | |
| parent | Update to version 0.4.4 (diff) | |
Gently persuade apache13-modssl to install in the same filesystem
space as www/apache13 does, so that other apache-dependendent ports
DTRT regardless of which one is installed.
Nothing concrete (other than we're working on a real cleanup of the
apache ports) has been heard from any of the maintainers. Obviously
that is the best solution, but with 4.2-RELEASE just around the
corner, we have an opportunity here to at least remove a few bogons.
Both times I've raised this issue on -ports, however, there has been
significant interest in the patches, and now plenty of confirmations
that the modifications do not break the port in other ways.
Notes
Notes:
svn path=/head/; revision=35170
Diffstat (limited to 'www/apache13-modssl/files/patch-ac')
| -rw-r--r-- | www/apache13-modssl/files/patch-ac | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/www/apache13-modssl/files/patch-ac b/www/apache13-modssl/files/patch-ac index 77ead0f0b54a..a009e6138b06 100644 --- a/www/apache13-modssl/files/patch-ac +++ b/www/apache13-modssl/files/patch-ac @@ -20,6 +20,30 @@ # # 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. @@ -38,3 +62,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 + |