Merge pull request #5420 from annando/notices

[friendica.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index a22c8c37acb6c48bba45979bc26affb84581e75d..a671cc680aff06f63aa301add63c8cc59c34ad33 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,9 +1,17 @@
 Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
+#AddHandler php53-cgi .php
 
 <FilesMatch "\.(out|log)$">
-Deny from all
+  <IfModule authz_host_module>
+    #Apache 2.4
+    Require all denied
+  </IfModule>
+  <IfModule !authz_host_module>
+    #Apache 2.2
+    Deny from all
+  </IfModule>
 </FilesMatch>
 
 <IfModule mod_rewrite.c>
@@ -11,7 +19,7 @@ Deny from all
   # Protect repository directory from browsing
   RewriteRule "(^|/)\.git" - [F]
 
-  # Rewrite current-style URLs of the form 'index.php?q=x'.
+  # Rewrite current-style URLs of the form 'index.php?pagename=x'.
   # Also place auth information into REMOTE_USER for sites running
   # in CGI mode.
 
@@ -21,13 +29,12 @@ Deny from all
   # Friendica url: http://some.example.com
   # RewriteBase /
   # Friendica url: http://some.example.com/friendica
-  # RewriteBase /firendica/
+  # RewriteBase /friendica/
   #
   #RewriteBase /
 
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+  RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
 
 </IfModule>
-