Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index fe09fc5224f3b76854ad49fa0bcf80fd1334c0a7..6cb3a074943c33d61c076d427ae4e5c154c4861c 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -8,14 +8,16 @@ Deny from all
 
 <IfModule mod_rewrite.c>
   RewriteEngine on
-
-  # Protect repo directory from browsing
+  # Protect repository directory from browsing
   RewriteRule "(^|/)\.git" - [F]
 
   # Rewrite current-style URLs of the form 'index.php?q=x'.
+  # Also place auth information into REMOTE_USER for sites running
+  # in CGI mode.
+
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
+  RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
 
 </IfModule>