X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=htaccess.sample;h=c7be2d86a0cd30b23ca5ed737e118ed90dcb20dd;hb=7dd7c5ded2519d46360ec330ae2f46fd8cc21096;hp=634900dbf6a642f24923970de29ba029fe2d56da;hpb=5c31dcb4304113e40b4a309a18d83dbdb712813e;p=quix0rs-gnu-social.git
diff --git a/htaccess.sample b/htaccess.sample
index 634900dbf6..c7be2d86a0 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,14 +1,42 @@
-RewriteEngine On
+
+ RewriteEngine On
-# NOTE: change this to your actual Laconica path; may be "/".
+ # NOTE: change this to your actual StatusNet base URL path,
+ # minus the domain part:
+ #
+ # http://example.com/ => /
+ # http://example.com/mublog/ => /mublog/
+ #
+ RewriteBase /
+ #RewriteBase /mublog/
-RewriteBase /mublog/
+ ## Uncomment these if having trouble with API authentication
+ ## when PHP is running in CGI or FastCGI mode.
+ #
+ #RewriteCond %{HTTP:Authorization} ^(.*)
+ #RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule (.*) index.php?p=$1 [L,QSA]
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteRule (.*) index.php?p=$1 [L,QSA]
+<<<<<<< HEAD
+
+ ## You can also use PATHINFO by using this RewriteRule instead:
+ # RewriteRule (.*) index.php/$1 [L,QSA]
+
+
+
+ # For mod_access_compat in Apache <2.4
+ Order allow,deny
+
+ # Use this instead for Apache >2.4 (mod_authz_host)
+ # Require all denied
+
+=======
+
Order allow,deny
+>>>>>>> Adding htaccess.sample back*shame*