From: kaldari <rkaldari@wikimedia.org>
Date: Mon, 1 Dec 2014 21:42:54 +0000 (-0800)
Subject: Add FollowSymLinks option to /images .htaccess rule
X-Git-Tag: 1.31.0-rc.0~13064
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=b981cf925c9e441bc00360b5d6bbe569e01cddc0;p=lhc%2Fweb%2Fwiklou.git

Add FollowSymLinks option to /images .htaccess rule

This makes sure that thumbnails load properly. Apparently
(in OSX at least), if you don't have FollowSymLinks or
SymLinksIfOwnerMatch on, loading thumbnails gives a 500
error with the existing rewrite rules in place.

Bug: 62289
Change-Id: Icc812fcf9a0b821d2ad84359e5c1d8fb8e9c78a0
---

diff --git a/images/.htaccess b/images/.htaccess
index 1cc74f42b0..8c46bbb4e8 100644
--- a/images/.htaccess
+++ b/images/.htaccess
@@ -3,4 +3,6 @@
 	RewriteEngine On
 	RewriteCond %{QUERY_STRING} \.[^\\/:*?\x22<>|%]+(#|\?|$) [nocase]
 	RewriteRule . - [forbidden]
+	# Fix for bug T64289
+	Options +FollowSymLinks
 </IfModule>