From 01ce92bc4362e3d2db721ca1348ccc0d2cc2711b Mon Sep 17 00:00:00 2001
From: Justin Carter <justin@daemon.com.au>
Date: Wed, 10 Feb 2016 16:50:02 +1100
Subject: [PATCH] FC-3061 Lucee 5 S3 extension compatibility

---
 packages/cdn/s3.cfc | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/cdn/s3.cfc b/packages/cdn/s3.cfc
index b91a7452d..893b9d07d 100644
--- a/packages/cdn/s3.cfc
+++ b/packages/cdn/s3.cfc
@@ -601,7 +601,13 @@
 			</cfif>
 			
 			<cftry>
-				<cfset putObject(config=arguments.dest_config,file=dest_file,localfile=arguments.source_localpath) />
+
+				<cfif structKeyExists(server, "lucee") AND listFirst(server.lucee.version, ".") gte 5>
+					<cffile action="write" output="#fileReadBinary(arguments.source_localpath)#" file="#getS3Path(config=arguments.dest_config,file=arguments.dest_file)#">
+				<cfelse>
+					<cfset putObject(config=arguments.dest_config,file=dest_file,localfile=arguments.source_localpath) />									
+				</cfif>
+
 				<cfset updateACL(config=arguments.dest_config,file=dest_file) />
 				
 				<cfcatch>
@@ -692,7 +698,13 @@
 			</cfif>
 			
 			<cftry>
-				<cfset putObject(config=arguments.dest_config,file=dest_file,localfile=arguments.source_localpath) />
+
+				<cfif structKeyExists(server, "lucee") AND listFirst(server.lucee.version, ".") gte 5>
+					<cffile action="write" output="#fileReadBinary(arguments.source_localpath)#" file="#getS3Path(config=arguments.dest_config,file=arguments.dest_file)#">
+				<cfelse>
+					<cfset putObject(config=arguments.dest_config,file=dest_file,localfile=arguments.source_localpath) />									
+				</cfif>
+
 				<cfset updateACL(config=arguments.dest_config,file=dest_file) />
 				
 				<cfcatch>