Skip to content

Commit

Permalink
Merge branch 'hotfix/8.10.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrispelzer committed Apr 30, 2024
2 parents 929e130 + 0972b86 commit ab37a8d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "base",
"private": true,
"version": "8.10.0",
"version": "8.10.1",
"description": "",
"scripts": {
"dev": "npm run development",
Expand Down
6 changes: 3 additions & 3 deletions public/.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
RewriteCond %{HTTP_HOST} ^www\.(.*)
RewriteRule ^.*$ https://%1%{REQUEST_URI} [L,R=307]

# If HTTP and we are not on foo.local, www-dev.foo, www-dev2.foo or www2.foo
# If HTTP and we are not on foo.local, foo.localhost, www-dev.foo, www-dev2.foo or www2.foo
# then force HTTPS
RewriteCond %{HTTPS} !=on
RewriteCond %{HTTP_HOST} !(?:\.local|www-dev2?\..*|www2\..*)$
RewriteCond %{HTTP_HOST} !(?:\.local|\.localhost|www-dev2?\..*|www2\..*)$
RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=307]

# Redirect Trailing Slashes If Not A Folder...
Expand All @@ -38,7 +38,7 @@
RewriteCond %{REQUEST_URI} \.(json)$
RewriteRule ^ - [F]

RewriteCond %{HTTP_HOST} !(?:\.local|www-dev2?\..*|www2\..*)$
RewriteCond %{HTTP_HOST} !(?:\.local|\.localhost|www-dev2?\..*|www2\..*)$
RewriteCond %{REQUEST_URI} \.(map)$
RewriteRule ^ - [F]

Expand Down

0 comments on commit ab37a8d

Please sign in to comment.