From 366c49c77d23769c3ac7dbbb496203cae321267e Mon Sep 17 00:00:00 2001
From: Michael Offner <michael@lucee.org>
Date: Mon, 20 Aug 2018 20:14:31 +0200
Subject: [PATCH] solved https://luceeserver.atlassian.net/browse/LDEV-1957

---
 .../runtime/functions/string/NewLine.java     | 25 ++++++++++++++++---
 core/src/main/java/resource/fld/core-cfml.fld |  7 ++++++
 loader/build.xml                              |  2 +-
 loader/pom.xml                                |  2 +-
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/lucee/runtime/functions/string/NewLine.java b/core/src/main/java/lucee/runtime/functions/string/NewLine.java
index 45ca2e041e..ee73d661a2 100644
--- a/core/src/main/java/lucee/runtime/functions/string/NewLine.java
+++ b/core/src/main/java/lucee/runtime/functions/string/NewLine.java
@@ -22,10 +22,29 @@
 package lucee.runtime.functions.string;
 
 import lucee.runtime.PageContext;
-import lucee.runtime.ext.function.Function;
+import lucee.runtime.exp.FunctionException;
+import lucee.runtime.exp.PageException;
+import lucee.runtime.ext.function.BIF;
+import lucee.runtime.op.Caster;
+
+public final class NewLine extends BIF {
+	
+	private static final long serialVersionUID = -5537738458169706L;
+	private static final String NL=System.getProperty("line.separator");
 
-public final class NewLine implements Function {
 	public static String call(PageContext pc) {
-		return "\n";		
+		return call(pc,true);		
+	}
+	
+	public static String call(PageContext pc, boolean includeCROnWindows) {
+		return includeCROnWindows?NL:"\n";		
+	}
+
+    @Override
+	public Object invoke(PageContext pc, Object[] args) throws PageException {
+		if(args.length==0) return call(pc,true);
+		if(args.length==1) return call(pc, Caster.toBooleanValue(args[0]));
+
+		throw new FunctionException(pc, "NewLine", 0, 1, args.length);
 	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/resource/fld/core-cfml.fld b/core/src/main/java/resource/fld/core-cfml.fld
index 459bc3c281..30f9ba767b 100755
--- a/core/src/main/java/resource/fld/core-cfml.fld
+++ b/core/src/main/java/resource/fld/core-cfml.fld
@@ -1531,6 +1531,13 @@ You can find a list of all available timezones in the Lucee administrator (Setti
 		<name>newLine</name>
 		<class>lucee.runtime.functions.string.NewLine</class>
 		<description>returns a new line</description>
+		<argument>
+			<name>includeCROnWindows</name>
+			<type>boolean</type>
+			<required>No</required>
+			<default>true</default>
+			<description>On windows computer include Carriage Return.</description>
+	    </argument>
 		<return>
 			<type>string</type>
 		</return>
diff --git a/loader/build.xml b/loader/build.xml
index 68810534fe..6a132dc63b 100644
--- a/loader/build.xml
+++ b/loader/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="core" basedir="." name="Lucee" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
-  <property name="version" value="5.3.1.42-SNAPSHOT"/>
+  <property name="version" value="5.3.1.43-SNAPSHOT"/>
 
   <path id="maven-ant-tasks.classpath" path="../ant/lib/maven-ant-tasks-2.1.3.jar" />
   <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
diff --git a/loader/pom.xml b/loader/pom.xml
index ada95797a1..921fb811ff 100644
--- a/loader/pom.xml
+++ b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>5.3.1.42-SNAPSHOT</version>
+  <version>5.3.1.43-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>