From 7e099bf9c0c2aaa21b7fe1cc4dd0ded9bb2e3420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= <25648755+M-arcus@users.noreply.github.com> Date: Tue, 15 May 2018 18:00:12 +0200 Subject: [PATCH 1/3] [BGUFIX] .htaccess: Add file Fixes https://github.com/friendica/friendica/pull/5042#issuecomment-389218702 --- .htaccess | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .htaccess diff --git a/.htaccess b/.htaccess new file mode 100644 index 0000000000..a671cc680a --- /dev/null +++ b/.htaccess @@ -0,0 +1,40 @@ +Options -Indexes +AddType application/x-java-archive .jar +AddType audio/ogg .oga +#AddHandler php53-cgi .php + + + + #Apache 2.4 + Require all denied + + + #Apache 2.2 + Deny from all + + + + + RewriteEngine on + # Protect repository directory from browsing + RewriteRule "(^|/)\.git" - [F] + + # Rewrite current-style URLs of the form 'index.php?pagename=x'. + # Also place auth information into REMOTE_USER for sites running + # in CGI mode. + + # If you have troubles or use VirtualDocumentRoot + # uncomment this and set it to the path where your friendica installation is + # i.e.: + # Friendica url: http://some.example.com + # RewriteBase / + # Friendica url: http://some.example.com/friendica + # RewriteBase /friendica/ + # + #RewriteBase / + + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA] + + From c17db5e26fe7e6fb98bd547df917df39880a0552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= <25648755+M-arcus@users.noreply.github.com> Date: Tue, 15 May 2018 18:00:12 +0200 Subject: [PATCH 2/3] Revert "[BGUFIX] .htaccess: Add file" This reverts commit 7e099bf9c0c2aaa21b7fe1cc4dd0ded9bb2e3420. --- .htaccess | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 .htaccess diff --git a/.htaccess b/.htaccess deleted file mode 100644 index a671cc680a..0000000000 --- a/.htaccess +++ /dev/null @@ -1,40 +0,0 @@ -Options -Indexes -AddType application/x-java-archive .jar -AddType audio/ogg .oga -#AddHandler php53-cgi .php - - - - #Apache 2.4 - Require all denied - - - #Apache 2.2 - Deny from all - - - - - RewriteEngine on - # Protect repository directory from browsing - RewriteRule "(^|/)\.git" - [F] - - # Rewrite current-style URLs of the form 'index.php?pagename=x'. - # Also place auth information into REMOTE_USER for sites running - # in CGI mode. - - # If you have troubles or use VirtualDocumentRoot - # uncomment this and set it to the path where your friendica installation is - # i.e.: - # Friendica url: http://some.example.com - # RewriteBase / - # Friendica url: http://some.example.com/friendica - # RewriteBase /friendica/ - # - #RewriteBase / - - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA] - - From 38666fa7fa01458936cfeb413fe5ab2cdfb5d189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= <25648755+M-arcus@users.noreply.github.com> Date: Tue, 15 May 2018 18:09:24 +0200 Subject: [PATCH 3/3] [BUGFIX] .htaccess: Rename file --- .gitignore | 3 --- .htaccess-dist => .htaccess | 0 2 files changed, 3 deletions(-) rename .htaccess-dist => .htaccess (100%) diff --git a/.gitignore b/.gitignore index 12dd3b49ea..9de700d148 100644 --- a/.gitignore +++ b/.gitignore @@ -62,6 +62,3 @@ vendor/* #ignore addons/ directory addons/ - -#Ignore .htaccess as it may contain local changes -.htaccess diff --git a/.htaccess-dist b/.htaccess similarity index 100% rename from .htaccess-dist rename to .htaccess