diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-02-06 16:43:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 16:43:39 +0100 |
| commit | 27f505667c4cffdb08247f8172b216f5a15ed081 (patch) | |
| tree | d71a755a0811e258e53928c8a6ad8af253e64062 | |
| parent | c688da7195755273f9b040dc9a16898686e6e68a (diff) | |
| parent | 7583615babc19711eb5f2865b81706d383b5649b (diff) | |
| download | nextcloud-server-27f505667c4cffdb08247f8172b216f5a15ed081.tar.gz nextcloud-server-27f505667c4cffdb08247f8172b216f5a15ed081.zip | |
Merge pull request #8182 from robert-scheck/pki-validation
Handle SSL certificate verifications for others than Let's Encrypt
| -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 7bf8759e383..005f23b64d5 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/.* + 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 43fa6c4a117..c0246a83e46 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -485,7 +485,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/.*"; + $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>"; |