X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=web%2F.htaccess;h=4dc725167db10e80b22cc25af2a0e4fe5b6c8b2a;hb=a03c4d90b2c3a84ecb994417e2877a7d847b462c;hp=b52e3ae622eaa75ddf27fab60cd4e8e012cfa71b;hpb=e4788de51ecbf2773a043325965e10eb74b14e8f;p=github%2Fwallabag%2Fwallabag.git
diff --git a/web/.htaccess b/web/.htaccess
index b52e3ae6..4dc72516 100644
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -5,6 +5,18 @@
# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
DirectoryIndex app.php
+# By default, Apache does not evaluate symbolic links if you did not enable this
+# feature in your server configuration. Uncomment the following line if you
+# install assets as symlinks or if you experience problems related to symlinks
+# when compiling LESS/Sass/CoffeScript assets.
+# Options FollowSymlinks
+
+# Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve
+# to the front controller "/app.php" but be rewritten to "/app.php/app".
+
+ Options -MultiViews
+
+
RewriteEngine On
@@ -18,9 +30,9 @@ DirectoryIndex app.php
RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$
RewriteRule ^(.*) - [E=BASE:%1]
- # Sets the HTTP_AUTHORIZATION header removed by apache
+ # Sets the HTTP_AUTHORIZATION header removed by Apache
RewriteCond %{HTTP:Authorization} .
- RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+ RewriteRule ^ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
# Redirect to URI without front controller to prevent duplicate content
# (with and without `/app.php`). Only do this redirect on the initial
@@ -34,15 +46,15 @@ DirectoryIndex app.php
# - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
# following RewriteCond (best solution)
RewriteCond %{ENV:REDIRECT_STATUS} ^$
- RewriteRule ^app\.php(/(.*)|$) %{ENV:BASE}/$2 [R=301,L]
+ RewriteRule ^app\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
# If the requested filename exists, simply serve it.
# We only want to let Apache serve files and not directories.
RewriteCond %{REQUEST_FILENAME} -f
- RewriteRule .? - [L]
+ RewriteRule ^ - [L]
# Rewrite all other queries to the front controller.
- RewriteRule .? %{ENV:BASE}/app.php [L]
+ RewriteRule ^ %{ENV:BASE}/app.php [L]