Merge branch '6.2' into 7.0

# Conflicts: # core/src/main/java/lucee/runtime/config/ConfigWebFactory.java # loader/build.xml # loader/pom.xml
lucee · Dec 13, 2024 · ca8d9cc · ca8d9cc
2 parents 73e33ef + 5a1d61c
commit ca8d9cc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/core/src/main/java/lucee/runtime/config/ConfigFactoryImpl.java b/core/src/main/java/lucee/runtime/config/ConfigFactoryImpl.java
@@ -3582,12 +3582,24 @@ public static void loadProxy(ConfigServerImpl config, Struct root) {
 			boolean hasAccess = ConfigUtil.hasAccess(config, SecurityManager.TYPE_SETTING);
 			Struct proxy = ConfigUtil.getAsStruct("proxy", root);
 
-			// proxy server
-			boolean enabled = Caster.toBooleanValue(getAttr(proxy, "enabled"), true);
-			String server = getAttr(proxy, "server");
-			String username = getAttr(proxy, "username");
-			String password = getAttr(proxy, "password");
-			int port = Caster.toIntValue(getAttr(proxy, "port"), -1);
+			boolean enabled = false;
+			String server = null, username = null, password = null;
+			int port = -1;
+			if (proxy != null && proxy.size() > 0) {
+				enabled = Caster.toBooleanValue(getAttr(proxy, "enabled"), true);
+				server = getAttr(proxy, "server");
+				username = getAttr(proxy, "username");
+				password = getAttr(proxy, "password");
+				port = Caster.toIntValue(getAttr(proxy, "port"), -1);
+			}
+			if (StringUtil.isEmpty(server, true)) {
+				server = getAttr(root, "updateProxyHost");
+				username = getAttr(root, "updateProxyUsername");
+				password = getAttr(root, "updateProxyPassword");
+				port = Caster.toIntValue(getAttr(root, "updateProxyPort"), -1);
+				enabled = !StringUtil.isEmpty(server, true);
+
+			}
 
 			// includes/excludes
 			Set<String> includes = proxy != null ? ProxyDataImpl.toStringSet(getAttr(proxy, "includes")) : null;

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="7.0.0.77-SNAPSHOT"/>
+  <property name="version" value="7.0.0.78-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>7.0.0.77-SNAPSHOT</version>
+  <version>7.0.0.78-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>