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

[Thijs Kinkhorst]

Author: thijs
Date: 2006-11-28 16:57:34 +0100 (Tue, 28 Nov 2006)
New Revision: 65

Modified:
   phpgedview/trunk/debian/apache.conf
   phpgedview/trunk/debian/changelog
Log:
* apache.conf: DirectoryMatch should be Directory, and wrap
  php_flag statements in IfModule tests to see whether we can
  actually set the flag.


Modified: phpgedview/trunk/debian/apache.conf
===================================================================
--- phpgedview/trunk/debian/apache.conf	2006-11-13 15:55:37 UTC (rev 64)
+++ phpgedview/trunk/debian/apache.conf	2006-11-28 15:57:34 UTC (rev 65)
@@ -1,7 +1,12 @@
 Alias /phpgedview /usr/share/phpgedview/www
 
-<DirectoryMatch /usr/share/phpgedview/www/>
-	php_flag register_globals off
+<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>
 	Options -Indexes +FollowSymlinks
 
 	DirectoryIndex index.php
@@ -9,5 +14,5 @@
 	AllowOverride None
 	order allow,deny
 	allow from all
-</DirectoryMatch>
+</Directory>
 

Modified: phpgedview/trunk/debian/changelog
===================================================================
--- phpgedview/trunk/debian/changelog	2006-11-13 15:55:37 UTC (rev 64)
+++ phpgedview/trunk/debian/changelog	2006-11-28 15:57:34 UTC (rev 65)
@@ -1,3 +1,11 @@
+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
+
 phpgedview (4.0.2.dfsg-1) unstable; urgency=low
 
   * New upstream bugfix release.