Merged changes form main trunk since 2.1RC

[fa-stable.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index 03410fbc3a34c234d1e457f64a2668d91d5bec1f..c80aa26e7548e5c169d024ebce63009d06837e49 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -2,10 +2,16 @@
 # Maybe you might have problems
 # with other scripts that needs
 # register_globals ON
-php_flag magic_quotes_gpc Off
-php_flag register_globals Off
-# do not use SID in url
-php_flag session.use_trans_sid Off
+<IfModule mod_php4.c>
+       php_flag magic_quotes_gpc Off
+       php_flag register_globals Off
+       php_flag session.use_trans_sid Off
+</IfModule>
+<IfModule mod_php5.c>
+       php_flag magic_quotes_gpc Off
+       php_flag register_globals Off
+       php_flag session.use_trans_sid Off
+</IfModule>
 
 #Sometimes neccessary to add those
 #