From 71791e3f6fd77dac49dbd917b610da2b969c426d Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 1 Apr 2015 15:18:15 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)   
 101036: Merged DEV (5.1.0) to HEAD-BUG-FIX (5.1/Cloud)       101019: SHA-52:
 Downloading file via Quick-Share link does not keep international characters
 in file names          - Corrected Spring bean for QuickShareContentGet.     
     - Added support for Safari in ContentGet.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/web-scripts-application-context.xml         | 1 +
 .../org/alfresco/repo/web/scripts/content/ContentGet.java   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index 7571b3c6bd..82f13cc350 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -1757,6 +1757,7 @@
         <property name="quickShareService" ref="QuickShareService"/>
         <property name="enabled" value="${system.quickshare.enabled}" />
         <property name="delegate" ref="webscript.content.streamer" />
+        <property name="contentService" ref="ContentService" />
     </bean>
     
     <!-- unauthenticated (note: equivalent to authenticated "thumbnail.get") -->
diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
index dccc065acd..2b84ce61ea 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
@@ -143,7 +143,11 @@ public class ContentGet extends StreamContent implements ServletContextAware
     {
         String userAgent = req.getHeader("User-Agent");
         userAgent = userAgent != null ? userAgent.toLowerCase() : "";
-        boolean rfc5987Supported = (userAgent.contains("msie") || userAgent.contains(" trident/") || userAgent.contains(" chrome/") || userAgent.contains(" firefox/"));
+        boolean rfc5987Supported = (userAgent.contains("msie") ||
+                userAgent.contains(" trident/") ||
+                userAgent.contains(" chrome/") ||
+                userAgent.contains(" firefox/") ||
+                userAgent.contains(" safari/"));
 
         if (attach && rfc5987Supported)
         {