X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=htaccess.sample;h=c7be2d86a0cd30b23ca5ed737e118ed90dcb20dd;hb=dd61ae8fbeee64c85f8186672292335592be1ff5;hp=fa09b30f6d950a3041e393864370623594460562;hpb=040b4b74ef2a2c86da039a93612266a67bb260d8;p=quix0rs-gnu-social.git
diff --git a/htaccess.sample b/htaccess.sample
index fa09b30f6d..c7be2d86a0 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -7,7 +7,8 @@
# http://example.com/ => /
# http://example.com/mublog/ => /mublog/
#
- RewriteBase /mublog/
+ RewriteBase /
+ #RewriteBase /mublog/
## Uncomment these if having trouble with API authentication
## when PHP is running in CGI or FastCGI mode.
@@ -18,9 +19,24 @@
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*