[pgv-svn] r66 - phpgedview/trunk/debian

Thijs Kinkhorst thijs at alioth.debian.org
Thu Jan 4 00:15:39 CET 2007


Author: thijs
Date: 2007-01-04 00:15:38 +0100 (Thu, 04 Jan 2007)
New Revision: 66

Modified:
   phpgedview/trunk/debian/apache.conf
   phpgedview/trunk/debian/changelog
Log:
revert ifmodule change; not acceptable after freeze


Modified: phpgedview/trunk/debian/apache.conf
===================================================================
--- phpgedview/trunk/debian/apache.conf	2006-11-28 15:57:34 UTC (rev 65)
+++ phpgedview/trunk/debian/apache.conf	2007-01-03 23:15:38 UTC (rev 66)
@@ -1,12 +1,7 @@
 Alias /phpgedview /usr/share/phpgedview/www
 
-<Directory /usr/share/phpgedview/www/>
-	<IfModule mod_php4.c>
-		php_flag register_globals off
-	</IfModule>
-	<IfModule mod_php5.c>
-		php_flag register_globals off
-	</IfModule>
+<DirectoryMatch /usr/share/phpgedview/www/>
+	php_flag register_globals off
 	Options -Indexes +FollowSymlinks
 
 	DirectoryIndex index.php
@@ -14,5 +9,5 @@
 	AllowOverride None
 	order allow,deny
 	allow from all
-</Directory>
+</DirectoryMatch>
 

Modified: phpgedview/trunk/debian/changelog
===================================================================
--- phpgedview/trunk/debian/changelog	2006-11-28 15:57:34 UTC (rev 65)
+++ phpgedview/trunk/debian/changelog	2007-01-03 23:15:38 UTC (rev 66)
@@ -1,8 +1,5 @@
 phpgedview (4.0.2.dfsg-2) unstable; urgency=low
 
-  * apache.conf: DirectoryMatch should be Directory, and wrap
-    php_flag statements in IfModule tests to see whether we can
-    actually set the flag.
 
  -- Thijs Kinkhorst <thijs at debian.org>  Tue, 28 Nov 2006 16:56:47 +0100
 




More information about the pkg-phpgedview-commit mailing list