From cee872ed90f81237255fd513ee22beac3f524fcc Mon Sep 17 00:00:00 2001
From: "Cathy J. Fitzpatrick" <cathy@cathyjf.com>
Date: Thu, 18 Apr 2013 01:16:28 -0600
Subject: [PATCH] Fix invalid `X-UA-Compatible` meta tag

---
 .htaccess           | 19 ++++++++++---------
 index.template.html |  1 -
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.htaccess b/.htaccess
index e8370c90e..7f8e46c13 100644
--- a/.htaccess
+++ b/.htaccess
@@ -23,8 +23,8 @@ RewriteEngine on
 RewriteCond %{HTTP_HOST} ^www\.play\.pokemonshowdown\.com$ [NC]
 RewriteRule ^(.*) http://play.pokemonshowdown.com/$1 [R=301,L]
 
-RewriteRule ^style/font/.*?\.(eot|svg|ttf|woff)$ - [env=SAFERESOURCE]
-Header set Access-Control-Allow-Origin * env=SAFERESOURCE
+RewriteRule ^style/font/.*?\.(eot|svg|ttf|woff)$ - [E=SAFE_RESOURCE]
+Header set Access-Control-Allow-Origin * env=SAFE_RESOURCE
 
 RewriteRule ^topsekritsim\.php$ / [R=301,L]
 RewriteRule ^topsekrit3\.php$ / [R=301,L]
@@ -34,15 +34,16 @@ RewriteRule ^sim\.php$ / [R=301,L]
 
 #RewriteRule ^([A-Za-z0-9-]*)$ closed.php [L,QSA]
 
-RewriteRule ^$ - [E=NOCACHE]
-RewriteRule ^(teambuilder|ladder|lobby|battle)$ ./ [L,E=NOCACHE]
+RewriteRule ^$ - [E=INDEX_PAGE]
+RewriteRule ^(teambuilder|ladder|lobby|battle)$ ./ [L,E=INDEX_PAGE]
 RewriteRule ^(teambuilder|ladder|lobby|battle)/$ /$1 [R=301,L]
-RewriteRule ^(lobby|battle)-([A-Za-z0-9-]*)$ ./ [L,E=NOCACHE]
+RewriteRule ^(lobby|battle)-([A-Za-z0-9-]*)$ ./ [L,E=INDEX_PAGE]
 
-# Request clients not to cache the index.
-Header set Cache-Control "no-cache, no-store, must-revalidate" env=NOCACHE
-Header set Pragma "no-cache" env=NOCACHE
-Header set Expires "0" env=NOCACHE
+# Headers for the index page.
+Header set Cache-Control "no-cache, no-store, must-revalidate" env=INDEX_PAGE
+Header set Pragma "no-cache" env=INDEX_PAGE
+Header set Expires "0" env=INDEX_PAGE
+Header set X-UA-Compatible "IE=Edge,chrome=1" env=INDEX_PAGE
 
 # No direct linking to the lobby.
 RewriteCond %{ENV:SCRIPT_URL} ^/(lobby/?)?$
diff --git a/index.template.html b/index.template.html
index d44a43b76..c0f30b1ed 100644
--- a/index.template.html
+++ b/index.template.html
@@ -18,7 +18,6 @@
 <link rel="stylesheet" href="style/utilichart.css" />
 <link rel="stylesheet" href="style/font-awesome.css" />
 <meta id="viewport" name="viewport" content="width=640"/>
-<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
 <script>
 	var _gaq = _gaq || [];
 	if (!Config.psim) {