Revert config changes.

(Portage version: 2.1_pre7-r2)

5 files changed, 36 insertions, 79 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 08495828cd3d..dcbc8d409807 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.82 2006/03/28 11:04:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.83 2006/03/28 21:35:40 chtekk Exp $
+
+  28 Mar 2006; Luca Longinotti <chtekk@gentoo.org>
+  files/70_mod_php.conf-apache1, files/70_mod_php.conf-apache2,
+  files/70_mod_php5.conf-apache1, files/70_mod_php5.conf-apache2:
+  Revert config changes for bug #127645.
 
   28 Mar 2006; Luca Longinotti <chtekk@gentoo.org>
   files/70_mod_php.conf-apache1, files/70_mod_php.conf-apache2,
diff --git a/dev-lang/php/files/70_mod_php.conf-apache1 b/dev-lang/php/files/70_mod_php.conf-apache1
index 6540ac7f65b5..6d352b03b303 100644
--- a/dev-lang/php/files/70_mod_php.conf-apache1
+++ b/dev-lang/php/files/70_mod_php.conf-apache1
@@ -5,26 +5,14 @@
 		LoadModule php4_module    modules/libphp4.so
 	</IfModule>
 
-	# If the module still isn't loaded, block access to PHP files
-	# Should help raise security, see bug #127645
-	<IfModule !mod_php4.c>
-		<Files ~ "\.ph(p|html|p3|p4)">
-			Order Deny,Allow
-			Deny from all
-		</Files>
-	</IfModule>
-
-	# Set it to handle the files, if it's loaded
-	<IfModule mod_php4.c>
-		<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>
+	# 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>
 
 	AddDirectoryIndex index.php index.phtml
-
 </IfDefine>
diff --git a/dev-lang/php/files/70_mod_php.conf-apache2 b/dev-lang/php/files/70_mod_php.conf-apache2
index 6b77e45db80a..d3ca2eaa00a0 100644
--- a/dev-lang/php/files/70_mod_php.conf-apache2
+++ b/dev-lang/php/files/70_mod_php.conf-apache2
@@ -5,26 +5,14 @@
 		LoadModule php4_module    modules/libphp4.so
 	</IfModule>
 
-	# If the module still isn't loaded, block access to PHP files
-	# Should help raise security, see bug #127645
-	<IfModule !sapi_apache2.c>
-		<Files ~ "\.ph(p|html|p3|p4)">
-			Order Deny,Allow
-			Deny from all
-		</Files>
-	</IfModule>
-
-	# Set it to handle the files, if it's loaded
-	<IfModule sapi_apache2.c>
-		<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>
+	# 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>
 
 	AddDirectoryIndex index.php index.phtml
-
 </IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache1 b/dev-lang/php/files/70_mod_php5.conf-apache1
index 861c9414ca02..e7604dffb042 100644
--- a/dev-lang/php/files/70_mod_php5.conf-apache1
+++ b/dev-lang/php/files/70_mod_php5.conf-apache1
@@ -5,27 +5,15 @@
 		LoadModule php5_module    modules/libphp5.so
 	</IfModule>
 
-	# If the module still isn't loaded, block access to PHP files
-	# Should help raise security, see bug #127645
-	<IfModule !mod_php5.c>
-		<Files ~ "\.ph(p|html|p3|p4|p5)">
-			Order Deny,Allow
-			Deny from all
-		</Files>
-	</IfModule>
-
-	# Set it to handle the files, if it's loaded
-	<IfModule mod_php5.c>
-		<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 .php5
-			AddType application/x-httpd-php-source .phps
-		</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 .php5
+		AddType application/x-httpd-php-source .phps
 	</IfModule>
 
 	AddDirectoryIndex index.php index.phtml
-
 </IfDefine>
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2
index 861c9414ca02..e7604dffb042 100644
--- a/dev-lang/php/files/70_mod_php5.conf-apache2
+++ b/dev-lang/php/files/70_mod_php5.conf-apache2
@@ -5,27 +5,15 @@
 		LoadModule php5_module    modules/libphp5.so
 	</IfModule>
 
-	# If the module still isn't loaded, block access to PHP files
-	# Should help raise security, see bug #127645
-	<IfModule !mod_php5.c>
-		<Files ~ "\.ph(p|html|p3|p4|p5)">
-			Order Deny,Allow
-			Deny from all
-		</Files>
-	</IfModule>
-
-	# Set it to handle the files, if it's loaded
-	<IfModule mod_php5.c>
-		<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 .php5
-			AddType application/x-httpd-php-source .phps
-		</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 .php5
+		AddType application/x-httpd-php-source .phps
 	</IfModule>
 
 	AddDirectoryIndex index.php index.phtml
-
 </IfDefine>