resolves https://luceeserver.atlassian.net/browse/LDEV-1623

lucee · Jan 17, 2018 · 81c0263 · 81c0263
1 parent 5c3b210
commit 81c0263
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/core/src/main/java/lucee/runtime/config/ConfigImpl.java b/core/src/main/java/lucee/runtime/config/ConfigImpl.java
@@ -3356,7 +3356,7 @@ public int getCFMLWriterType() {
 		return writerType;
 	}
 
-	private boolean bufferOutput=true;
+	private boolean bufferOutput=false;
 
 
 	private int externalizeStringGTE=-1;

diff --git a/core/src/main/java/lucee/runtime/config/XMLConfigAdmin.java b/core/src/main/java/lucee/runtime/config/XMLConfigAdmin.java
@@ -2872,7 +2872,8 @@ public void updateBufferOutput(Boolean value) throws SecurityException {
         if(!hasAccess) throw new SecurityException("no access to update scope setting");
 
         Element scope=_getRootElement("setting");
-        scope.setAttribute("buffer-output",Caster.toString(value,""));
+        scope.setAttribute("buffering-output",Caster.toString(value,""));
+        if(scope.hasAttribute("buffer-output"))scope.removeAttribute("buffer-output");
 	}
 
     /**

diff --git a/core/src/main/java/lucee/runtime/config/XMLConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/XMLConfigWebFactory.java
@@ -3195,9 +3195,7 @@ else if (hasCS)
 		// buffer-output
 		str = null;
 		if (setting != null) {
-			str = getAttr(setting,"buffer-output");
-			if (StringUtil.isEmpty(str))
-				str = getAttr(setting,"bufferoutput");
+			str = getAttr(setting,"buffering-output");
 		}
 		Boolean b = Caster.toBoolean(str, null);
 		if (b != null && hasAccess) {

diff --git 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.2.6.35-SNAPSHOT"/>
+  <property name="version" value="5.2.6.36-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
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>5.2.6.35-SNAPSHOT</version>
+  <version>5.2.6.36-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>