Merge pull request #2190 from annando/1512-getload

[friendica.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index 6cb3a074943c33d61c076d427ae4e5c154c4861c..1b63f9ad6fb2b81060f5da54cdc82277ceb7f310 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,7 @@
 Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
+#AddHandler php53-cgi .php
 
 <FilesMatch "\.(out|log)$">
 Deny from all
@@ -11,13 +12,23 @@ 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.
 
+  # If you have troubles or use VirtualDocumentRoot
+  # uncomment this and set it to the path where your friendica installation is
+  # i.e.:
+  # Friendica url: http://some.example.com
+  # RewriteBase /
+  # Friendica url: http://some.example.com/friendica
+  # 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>