Merge remote-tracking branch 'upstream/master' into develop

[friendica.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index 2348cdc38b36ca4eed776ae762eee7d2c8edf660..1210dcf29cb59f5e38ba349d7a8c523a905e0afd 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -37,5 +37,10 @@ AddType audio/ogg .oga
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
 
+  # If you want to restrict access to your Friendica site to HTTPS only,
+  # uncommment the following lines
+  #RewriteCond %{HTTPS} !=on
+  #RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]
+  
 </IfModule>