diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-02-28 22:36:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 22:36:14 +0100 |
| commit | fb322322fca2acc3bc66a5ba070d1cf2b8ef8619 (patch) | |
| tree | c0b527b311b526ecfad146e6a4ac68b0ec7e185c | |
| parent | faca63460600665cd9de5619188d0187c6f40d3e (diff) | |
| parent | 87975900992aaa8fd0fd6dc997dd8aba6a7d60a1 (diff) | |
| download | nextcloud-server-fb322322fca2acc3bc66a5ba070d1cf2b8ef8619.tar.gz nextcloud-server-fb322322fca2acc3bc66a5ba070d1cf2b8ef8619.zip | |
Merge pull request #8581 from callahad/fix-8578
Correct mistaken regex wildcard in .htaccess
| -rw-r--r-- | .htaccess | 2 | ||||
| -rw-r--r-- | lib/private/Setup.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.htaccess b/.htaccess index 005f23b64d5..81dae47a34d 100644 --- a/.htaccess +++ b/.htaccess @@ -63,7 +63,7 @@ RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L] RewriteRule ^remote/(.*) remote.php [QSA,L] RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L] - RewriteCond %{REQUEST_URI} !^/.well-known/(acme-challenge|pki-validation)/.* + RewriteCond %{REQUEST_URI} !^/\.well-known/(acme-challenge|pki-validation)/.* RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L] </IfModule> <IfModule mod_mime.c> diff --git a/lib/private/Setup.php b/lib/private/Setup.php index 212deeeba0f..5564bb5b072 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -490,7 +490,7 @@ class Setup { $content .= "\n RewriteCond %{REQUEST_FILENAME} !/robots.txt"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/updater/"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocs-provider/"; - $content .= "\n RewriteCond %{REQUEST_URI} !^/.well-known/(acme-challenge|pki-validation)/.*"; + $content .= "\n RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*"; $content .= "\n RewriteRule . index.php [PT,E=PATH_INFO:$1]"; $content .= "\n RewriteBase " . $rewriteBase; $content .= "\n <IfModule mod_env.c>"; |