diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2023-10-11 07:25:41 -0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-11 07:25:41 -0100 |
| commit | 76340f7ea81b0150f75d687da9bf9902d9bc9684 (patch) | |
| tree | 95e6e357320afa0d47ae868fdfe6a1cd4d14cd41 | |
| parent | 02befe415ba30595a36a312a810efa08842b5dad (diff) | |
| parent | 20170897bd7a6902e142cbc6687024b942a4a12d (diff) | |
| download | nextcloud-server-76340f7ea81b0150f75d687da9bf9902d9bc9684.tar.gz nextcloud-server-76340f7ea81b0150f75d687da9bf9902d9bc9684.zip | |
Merge pull request #40781 from nextcloud/backport/40745/stable26
[stable26] fix ocm-provider rewrite rules
| -rw-r--r-- | .htaccess | 1 | ||||
| -rw-r--r-- | lib/private/Setup.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.htaccess b/.htaccess index 956e29ea7c4..38c3ec5e7d4 100644 --- a/.htaccess +++ b/.htaccess @@ -99,6 +99,7 @@ RewriteRule ^remote/(.*) remote.php [QSA,L] RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L] RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L] + RewriteRule ^ocm-provider/?$ /index.php [QSA,L] RewriteRule ^(?:\.(?!well-known)|autotest|occ|issue|indie|db_|console).* - [R=404,L] </IfModule> diff --git a/lib/private/Setup.php b/lib/private/Setup.php index dc59eacbf57..5428e599a80 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -535,7 +535,7 @@ class Setup { $content .= "\n RewriteCond %{REQUEST_FILENAME} !/(cron|public|remote|status)\\.php"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/ocs/v(1|2)\\.php"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/robots\\.txt"; - $content .= "\n RewriteCond %{REQUEST_FILENAME} !/(ocm-provider|ocs-provider|updater)/"; + $content .= "\n RewriteCond %{REQUEST_FILENAME} !/(ocs-provider|updater)/"; $content .= "\n RewriteCond %{REQUEST_URI} !^/\\.well-known/(acme-challenge|pki-validation)/.*"; $content .= "\n RewriteCond %{REQUEST_FILENAME} !/richdocumentscode(_arm64)?/proxy.php$"; $content .= "\n RewriteRule . index.php [PT,E=PATH_INFO:$1]"; |