Merge remote branch 'upstream/master'

[friendica.git] / .htaccess

diff --git a/.htaccess b/.htaccess
old mode 100644 (file)
new mode 100755 (executable)
index c95f11e..28ac3dd
--- a/.htaccess
+++ b/.htaccess
@@ -1,24 +1,26 @@
-
 Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
 
-php_value suhosin.get.max_value_length = 2048
-
 <FilesMatch "\.(out|log)$">
 Deny from all
 </FilesMatch>
+<Files "(include|library)">
+Deny from all
+</Files>
 
 <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>