diff --git a/.htaccess b/.htaccess index 2e31a080af..1924df20dc 100644 --- a/.htaccess +++ b/.htaccess @@ -38,7 +38,7 @@ # Cross-domain AJAX requests # ---------------------------------------------------------------------- -# Serve cross-domain ajax requests, disabled. +# Serve cross-domain Ajax requests, disabled by default. # enable-cors.org # code.google.com/p/html5security/wiki/CrossOriginRequestSecurity @@ -47,6 +47,22 @@ # +# ---------------------------------------------------------------------- +# CORS-enabled images (@crossorigin) +# ---------------------------------------------------------------------- + +# Send CORS headers if browsers request them; enabled by default. +# developer.mozilla.org/en/CORS_Enabled_Image +# blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html +# hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/ + + + + SetEnvIf Origin ":" IS_CORS + Header set Access-Control-Allow-Origin "*" env=IS_CORS + + + # ---------------------------------------------------------------------- # Webfont access diff --git a/img/.gitignore b/img/.gitignore index 4397c3a32c..e69de29bb2 100644 --- a/img/.gitignore +++ b/img/.gitignore @@ -1,2 +0,0 @@ -!.gitignore - diff --git a/index.html b/index.html index 0304860e5f..c5b4b89f0a 100644 --- a/index.html +++ b/index.html @@ -59,7 +59,7 @@