LDEV-3349 avoid re-encoding url params with +

https://luceeserver.atlassian.net/browse/LDEV-3349

core/src/main/java/lucee/commons/net/HTTPUtil.java

@@ -368,7 +368,7 @@ private static String getProtocol(URL url) {
 	}
 
 	public static String escapeQSValue(String str, boolean encodeOnlyWhenNecessary) {
-		if (encodeOnlyWhenNecessary && !ReqRspUtil.needEncoding(str, false)) return str;
+		if (encodeOnlyWhenNecessary && !ReqRspUtil.needEncoding(str)) return str;
 		PageContextImpl pc = (PageContextImpl) ThreadLocalPageContext.get();
 		if (pc != null) {
 			try {

core/src/main/java/lucee/commons/net/http/httpclient/HTTPEngine4Impl.java

@@ -505,8 +505,8 @@ public static void setProxy(String host, HttpClientBuilder builder, HttpUriReque
 	}
 
 	public static void addCookie(CookieStore cookieStore, String domain, String name, String value, String path, String charset) {
-		if (ReqRspUtil.needEncoding(name, false)) name = ReqRspUtil.encode(name, charset);
-		if (ReqRspUtil.needEncoding(value, false)) value = ReqRspUtil.encode(value, charset);
+		if (ReqRspUtil.needEncoding(name)) name = ReqRspUtil.encode(name, charset);
+		if (ReqRspUtil.needEncoding(value)) value = ReqRspUtil.encode(value, charset);
 		BasicClientCookie cookie = new BasicClientCookie(name, value);
 		if (!StringUtil.isEmpty(domain, true)) cookie.setDomain(domain);
 		if (!StringUtil.isEmpty(path, true)) cookie.setPath(path);

core/src/main/java/lucee/runtime/functions/other/URLEncode.java

@@ -45,7 +45,7 @@ public static String call(PageContext pc, String str, String encoding, boolean f
 
 	public static String invoke(String str, String encoding, boolean force) throws PageException {
 
-		if (!force && !ReqRspUtil.needEncoding(str, false)) return str;
+		if (!force && !ReqRspUtil.needEncoding(str)) return str;
 
 		try {
 

core/src/main/java/lucee/runtime/functions/other/URLEncodedFormat.java

@@ -49,7 +49,7 @@ public static String call(PageContext pc, String str, String encoding, boolean f
 	}
 
 	public static String invoke(String str, String encoding, boolean force) throws PageException {
-		if (!force && !ReqRspUtil.needEncoding(str, false)) return str;
+		if (!force && !ReqRspUtil.needEncoding(str)) return str;
 
 		try {
 			String enc = lucee.commons.net.URLEncoder.encode(str, encoding);

core/src/main/java/lucee/runtime/functions/system/InternalRequest.java

@@ -344,7 +344,7 @@ private static void releasePageContext(PageContext pc, PageContext oldPC) {
 
 	private static String urlenc(String str, Charset charset) throws PageException {
 		try {
-			if (!ReqRspUtil.needEncoding(str, false)) return str;
+			if (!ReqRspUtil.needEncoding(str)) return str;
 			return URLEncoder.encode(str, charset);
 		}
 		catch (UnsupportedEncodingException uee) {

core/src/main/java/lucee/runtime/net/http/HttpUtil.java

@@ -87,7 +87,7 @@ public static Pair<String, String>[] cloneParameters(PageContext pc, HttpServlet
 		while (e.hasMoreElements()) {
 			name = (String) e.nextElement();
 			values = req instanceof HTTPServletRequestWrap ? ((HTTPServletRequestWrap) req).getParameterValues(pc, name) : req.getParameterValues(name);
-			if (values == null && ReqRspUtil.needEncoding(name, false)) values = req.getParameterValues(ReqRspUtil.encode(name, ReqRspUtil.getCharacterEncoding(null, req)));
+			if (values == null && ReqRspUtil.needEncoding(name)) values = req.getParameterValues(ReqRspUtil.encode(name, ReqRspUtil.getCharacterEncoding(null, req)));
 			if (values == null) {
 				if (pc != null && ReqRspUtil.identical(pc.getHttpServletRequest(), req)) {
 					values = HTTPServletRequestWrap.getParameterValues(pc, name);

core/src/main/java/lucee/runtime/net/http/ReqRspUtil.java

@@ -48,6 +48,7 @@
 
 import lucee.commons.io.CharsetUtil;
 import lucee.commons.io.IOUtil;
+import lucee.commons.io.SystemUtil;
 import lucee.commons.lang.ExceptionUtil;
 import lucee.commons.lang.Pair;
 import lucee.commons.lang.StringUtil;
@@ -74,6 +75,12 @@
 
 public final class ReqRspUtil {
 
+	private static boolean urlEncodeAllowPlus;
+
+	static {
+		urlEncodeAllowPlus = Caster.toBooleanValue(SystemUtil.getSystemPropOrEnvVar("lucee.url.encodeAllowPlus", "true"), true);
+	}
+
 	private static Map<String, String> rootPathes = new ReferenceMap<String, String>(HARD, SOFT);
 
 	public static String get(Pair<String, Object>[] items, String name) {
@@ -292,6 +299,10 @@ public static String encode(String str, Charset charset) {
 		}
 	}
 
+	public static boolean needEncoding(String str) {
+		return needEncoding(str, urlEncodeAllowPlus);
+	}
+
 	public static boolean needEncoding(String str, boolean allowPlus) {
 		if (StringUtil.isEmpty(str, false)) return false;
 

core/src/main/java/lucee/runtime/tag/Http.java

@@ -1627,7 +1627,7 @@ private static String headerValue(String value) {
 	}
 
 	private static String urlenc(String str, String charset, boolean checkIfNeeded) throws UnsupportedEncodingException {
-		if (checkIfNeeded && !ReqRspUtil.needEncoding(str, false)) return str;
+		if (checkIfNeeded && !ReqRspUtil.needEncoding(str)) return str;
 		return URLEncoder.encode(str, CharsetUtil.toCharset(charset));
 	}
 

core/src/main/java/lucee/runtime/type/scope/CookieImpl.java

@@ -402,7 +402,7 @@ public String enc(String str, boolean encode) {
 	}
 
 	public String enc(String str) {
-		if (ReqRspUtil.needEncoding(str, false)) return enc(str, true);
+		if (ReqRspUtil.needEncoding(str)) return enc(str, true);
 		return enc(str, false);
 	}
 

core/src/main/java/lucee/runtime/type/scope/util/ScopeUtil.java

@@ -77,7 +77,7 @@ public static String[] getParameterValues(URLItem[][] itemsArr, String[] encodin
 		for (int x = 0; x < itemsArr.length; x++) {
 			items = itemsArr[x];
 			encoding = encodings[x];
-			if (ReqRspUtil.needEncoding(name, false)) encName = ReqRspUtil.encode(name, encoding);
+			if (ReqRspUtil.needEncoding(name)) encName = ReqRspUtil.encode(name, encoding);
 			else encName = null;
 			for (int i = 0; i < items.length; i++) {
 				n = items[i].getName();