COLDBOX-1370 #resolve

renderData not sending encoding with content-type header

Author: lmajano

system/RestHandler.cfc

@@ -425,7 +425,7 @@ component extends="EventHandler" {
 		 * When you need a really hard stop to prevent further execution ( use as last resort )
 		 */
 		if ( arguments.abort ) {
-			event.setHTTPHeader( name = "Content-Type", value = "application/json" );
+			event.setHTTPHeader( name = "Content-Type", value = "application/json; charset=utf-8" );
 			event.setHTTPHeader( statusCode = "#arguments.event.STATUS.NOT_AUTHENTICATED#" );
 
 			writeOutput( toJson( prc.response.getDataPacket( reset = this.resetDataOnError ) ) );
@@ -477,7 +477,7 @@ component extends="EventHandler" {
 		 * When you need a really hard stop to prevent further execution ( use as last resort )
 		 */
 		if ( arguments.abort ) {
-			event.setHTTPHeader( name = "Content-Type", value = "application/json" );
+			event.setHTTPHeader( name = "Content-Type", value = "application/json; charset=utf-8" );
 			event.setHTTPHeader( statusCode = "#arguments.event.STATUS.NOT_AUTHORIZED#" );
 
 			writeOutput( serializeJSON( prc.response.getDataPacket( reset = this.resetDataOnError ) ) );

system/web/context/RequestContext.cfc

@@ -1744,7 +1744,7 @@ component serializable="false" accessors="true" {
 		// Automatic Content Types by marshalling type
 		switch ( rd.type ) {
 			case "JSON": {
-				rd.contenttype = "application/json";
+				rd.contenttype = "application/json; charset=#arguments.encoding#";
 				if ( arguments.jsonAsText ) {
 					rd.contentType = "text/plain";
 				}