diff --git a/.htaccess b/.htaccess index 1728b6d9b..a3ee888d6 100644 --- a/.htaccess +++ b/.htaccess @@ -29,6 +29,7 @@ Header unset Vary env=BINGBOT # Redirect dev.pokemonshowdown.com to beta.psim.us # RewriteCond %{HTTP_HOST} ^(www\.)?dev\.pokemonshowdown\.com$ [NC] # RewriteCond %{REMOTE_ADDR} !^69\.85\.87\.173$ +# RewriteCond %{REMOTE_ADDR} !^173\.213\.97\.68$ # RewriteCond %{REMOTE_ADDR} !^173\.252\.196\.254$ # RewriteCond %{REQUEST_URI} ^/$ [OR] # RewriteCond %{REQUEST_URI} ^/robots\.txt$ [OR] @@ -56,9 +57,9 @@ RewriteRule ^sim\.php$ / [R=301,L] RewriteRule ^$ - [E=INDEX_PAGE:1] RewriteRule ^lobby/?$ / [R=301,L] -RewriteRule ^(teambuilder|ladder|battle)$ ./ [L,E=INDEX_PAGE] +RewriteRule ^(teambuilder|ladder|battle)$ ./ [L,E=INDEX_PAGE:1] RewriteRule ^(teambuilder|ladder|battle)/$ /$1 [R=301,L] -RewriteRule ^(lobby|battle)-([A-Za-z0-9-]*)$ ./ [L,E=INDEX_PAGE] +RewriteRule ^(lobby|battle)-([A-Za-z0-9-]*)$ ./ [L,E=INDEX_PAGE:1] # Headers for the index page. Header set Cache-Control "no-cache, no-store, must-revalidate" env=INDEX_PAGE @@ -71,6 +72,7 @@ RewriteCond %{ENV:SCRIPT_URL} ^/(lobby/?)?$ RewriteCond %{HTTP_REFERER} !^$ RewriteCond %{HTTP_REFERER} !^https?:\/\/([a-z0-9-]+.)?(pokemonshowdown\.com|appjs) RewriteCond %{REMOTE_ADDR} !^69\.85\.87\.173$ +RewriteCond %{REMOTE_ADDR} !^173\.213\.97\.68$ RewriteCond %{REMOTE_ADDR} !^173\.252\.196\.254$ RewriteCond %{REMOTE_ADDR} !^127\.0\.0\.1$ RewriteRule ^.* http://www.pokemonshowdown.com/ [R=303,L]