Changeset 32433 for main

Timestamp:

2018-09-07T19:54:41+12:00 (6 years ago)

Author:

ak19

Message:

Oversight. If httpPort is 80, don't append colon and 80 to form base URL.

File:

• main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java

@@ -224 +224 @@
             String httpPort = properties.getProperty("localhost.port.http");
             localhost_http_web_address = properties.getProperty("localhost.protocol.http") + "://"
-                + properties.getProperty("localhost.server.http", "127.0.0.1") // likely to be 127.0.0.1 rather than localhost, since localhost can be modified and is therefore unsafe
-                + httpPort;
-
-
+                + properties.getProperty("localhost.server.http", "127.0.0.1"); // 127.0.0.1 better as fallback rather than localhost, since localhost can be modified and is therefore unsafe
+            if(httpPort != null && !httpPort.equals("") && !httpPort.equals("80")) { // no need to check 443, *http*Port can't be 443
+                localhost_http_web_address = localhost_http_web_address + ":" + httpPort;
+            }
 
             // set the http and https variants of the full web address, if they're meant to be available