Merge commit 'upstream/master'

1 files changed, 21 insertions, 1 deletions

diff --git a/.htaccess b/.htaccess
index 79ba4be2..08b9c5bb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -9,6 +9,26 @@
   php_value post_max_size 	  100M
 </IfModule>
 
+# Try to disable the parts of mod_security that interfere with the Flash uploader
+#
+<IfModule mod_security.c>
+  SecFilterEngine Off
+  SecFilterScanPOST Off
+</IfModule>
+
+# Improve performance by uncommenting this block.  It tells the
+# browser that your images don't change very often so it won't keep
+# asking for them.  If you get an error after uncommenting this, make
+# sure you specify "AuthConfig Indexes" in your Apache config file.
+#
+# <IfModule mod_expires.c>
+#   ExpiresActive On
+#   # Cache all files for a month after access (A).
+#   ExpiresDefault A2678400
+#   # Do not cache dynamically generated pages.
+#   ExpiresByType text/html A1
+# </IfModule>
+
 # You can use mod_rewrite to enable short urls in Gallery 3 (which
 # gets rid of the "index.php" from your urls).  To do this, you must
 # uncomment the block below that starts with <IfModule> and ends with
@@ -16,7 +36,7 @@
 # block below.  You just need to change RewriteBase line to match your
 # Gallery 3 URL.  Here are some examples:
 #
-#   Gallery3 URL                        RewriteBase line
+#   Gallery 3 URL                       RewriteBase line
 #   =============                       ====================
 #   http://example.com/gallery3         RewriteBase /gallery3
 #   http://example.com/~bob/photos      RewriteBase /~bob/photos