diff --git a/aws.cfc b/aws.cfc index d7a7bab..08e8fee 100644 --- a/aws.cfc +++ b/aws.cfc @@ -39,7 +39,12 @@ component { struct constructorArgs = { }, struct httpProxy = { server: '', port: 80 } ) { - this.api = new com.api( awsKey, awsSecretKey, defaultRegion, httpProxy ); + this.api = new com.api( + awsKey, + awsSecretKey, + defaultRegion, + httpProxy + ); for ( var service in variables.services ) { if ( structKeyExists( arguments.constructorArgs, service ) ) { diff --git a/box.json b/box.json index 6ff0ace..3e29c18 100644 --- a/box.json +++ b/box.json @@ -31,7 +31,7 @@ "URL":"http://opensource.org/licenses/MIT" } ], - "location":"jcberquist/aws-cfml#v1.11.0", + "location":"jcberquist/aws-cfml#v1.12.0", "name":"aws-cfml", "packageDirectory":"awscfml", "private":false, @@ -39,5 +39,5 @@ "shortDescription":"AWS CFML is a CFML library for interacting with AWS APIs", "slug":"aws-cfml", "type":"modules", - "version":"1.11.0" + "version":"1.12.0" } diff --git a/com/http/coldfusion.cfc b/com/http/coldfusion.cfc index 461978c..85bdd12 100644 --- a/com/http/coldfusion.cfc +++ b/com/http/coldfusion.cfc @@ -5,6 +5,7 @@ component { struct httpProxy = { server: '', port: 80 } ) { variables.utils = utils; + variables.httpProxy = httpProxy; return this; } @@ -22,14 +23,21 @@ component { var request_headers = utils.parseHeaders( headers ); var urlPath = 'http' & ( useSSL ? 's' : '' ) & '://' & fullPath; - cfhttp(url=urlPath, method=httpMethod, result="result", timeout=timeout, proxyserver=httpProxy.server, proxyport=httpProxy.port) { + cfhttp( + url = urlPath, + method = httpMethod, + result = "result", + timeout = timeout, + proxyserver = httpProxy.server, + proxyport = httpProxy.port + ) { for ( var header in request_headers ) { if ( header.name == 'host' ) continue; - cfhttpparam(type="header", name=lCase( header.name ), value=header.value); + cfhttpparam( type = "header", name = lCase( header.name ), value = header.value ); } if ( arrayFindNoCase( [ 'POST', 'PUT' ], httpMethod ) && !isNull( arguments.body ) ) { - cfhttpparam(type="body", value=body); + cfhttpparam( type = "body", value = body ); } } return result; diff --git a/com/http/lucee.cfc b/com/http/lucee.cfc index e5e4a4d..5846ab6 100644 --- a/com/http/lucee.cfc +++ b/com/http/lucee.cfc @@ -23,7 +23,14 @@ component { var request_headers = utils.parseHeaders( headers ); var urlPath = 'http' & ( useSSL ? 's' : '' ) & '://' & fullPath; - http url=urlPath method=httpMethod result="result" encodeurl=false timeout=timeout proxyServer=httpProxy.server proxyPort=httpProxy.port { + http + url=urlPath + method=httpMethod + result="result" + encodeurl=false + timeout=timeout + proxyServer=httpProxy.server + proxyPort=httpProxy.port { for ( var header in request_headers ) { if ( header.name == 'host' ) continue; httpparam type="header" name=lCase( header.name ) value=header.value;