diff options
| author |   Christian Hoffmann <hoffie@gentoo.org> | 2009-01-11 21:16:32 +0000 |
|---|---|---|
| committer | Christian Hoffmann <hoffie@gentoo.org> | 2009-01-11 21:16:32 +0000 |
| commit | 7e18465031d9810503278529f5a9a98aae99d332 (patch) | |
| tree | 02020ae153a1bc180dbdc8f384db02093570aafc /dev-lang/php/files | |
| parent | amd64 stable, bug #254069 (diff) | |
| download | historical-7e18465031d9810503278529f5a9a98aae99d332.tar.gz historical-7e18465031d9810503278529f5a9a98aae99d332.tar.bz2 historical-7e18465031d9810503278529f5a9a98aae99d332.zip | |
revision bump to fix bug 162478 (dropping usage of AddType apache config directive) and bug 249703 (libxml2-2.7 breakage) and an upstream fix for bug 217392; removing old and unused files
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64
Diffstat (limited to 'dev-lang/php/files')
| -rw-r--r-- | dev-lang/php/files/70_mod_php.conf-apache2 | 17 | ||||
| -rw-r--r-- | dev-lang/php/files/70_mod_php5.conf-apache2-r1 | 17 | ||||
| -rw-r--r-- | dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 | 17 | ||||
| -rw-r--r-- | dev-lang/php/files/70_mod_php_concurr.conf-apache2 | 14 |
4 files changed, 34 insertions, 31 deletions
diff --git a/dev-lang/php/files/70_mod_php.conf-apache2 b/dev-lang/php/files/70_mod_php.conf-apache2 deleted file mode 100644 index 90cabfb02dcd..000000000000 --- a/dev-lang/php/files/70_mod_php.conf-apache2 +++ /dev/null @@ -1,17 +0,0 @@ -<IfDefine PHP4> - # Load the module first - <IfModule !sapi_apache2.c> - LoadModule php4_module modules/libphp4.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - AddType application/x-httpd-php .php - AddType application/x-httpd-php .phtml - AddType application/x-httpd-php .php3 - AddType application/x-httpd-php .php4 - AddType application/x-httpd-php-source .phps - </IfModule> - - DirectoryIndex index.php index.phtml -</IfDefine> diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5.conf-apache2-r1 new file mode 100644 index 000000000000..50911ad39d9c --- /dev/null +++ b/dev-lang/php/files/70_mod_php5.conf-apache2-r1 @@ -0,0 +1,17 @@ +<IfDefine PHP5> + # Load the module first + <IfModule !mod_php5.c> + LoadModule php5_module modules/libphp5.so + </IfModule> + + # Set it to handle the files + <FilesMatch "\.ph(p5?|tml)$"> + SetHandler application/x-httpd-php + </FilesMatch> + + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> + + DirectoryIndex index.php index.phtml +</IfDefine> diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 new file mode 100644 index 000000000000..cd1c3801edbc --- /dev/null +++ b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 @@ -0,0 +1,17 @@ +<IfDefine PHP5> + # Load the module first + <IfModule !mod_php5.c> + LoadModule php5_module modules/libphp5.so + </IfModule> + + # Set it to handle the files + <FilesMatch "\.ph(p5?|tml)$"> + SetHandler application/x-httpd-php5 + </FilesMatch> + + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php5-source + </FilesMatch> + + DirectoryIndex index.php index.phtml +</IfDefine> diff --git a/dev-lang/php/files/70_mod_php_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php_concurr.conf-apache2 deleted file mode 100644 index fa73e7685ec1..000000000000 --- a/dev-lang/php/files/70_mod_php_concurr.conf-apache2 +++ /dev/null @@ -1,14 +0,0 @@ -<IfDefine PHP4> - # Load the module first - <IfModule !sapi_apache2.c> - LoadModule php4_module modules/libphp4.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - AddType application/x-httpd-php4 .php3 - AddType application/x-httpd-php4 .php4 - </IfModule> - - DirectoryIndex index.php index.phtml -</IfDefine> |