Changeset 31820 for main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

Timestamp:

2017-07-24T21:45:30+12:00 (7 years ago)

Author:

ak19

Message:

The changes necessary for GLI's Java code to work properly with a wget that can handle https. Next step is to compile up wget with open_ssl so that it supports https. So far tested against the system wget (which supports https) after copying this into the GS2 location in gs2build/bin/linux, since that's the location which GS uses to load wget from.

File:

• main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -623 +623 @@
             // Specify proxies as environment variables
             // Need to manually specify GSDLHOME and GSDLOS also
-            env = new String[4];
+            env = new String[5];
                     proxy_url = proxy_url.replaceAll("http://","");
             env[0] = "http_proxy=http://"+proxy_url;
-            env[1] = "ftp_proxy=ftp://"+proxy_url;
-            env[2] = "GSDLHOME=" + Configuration.gsdl_path;
-            env[3] = "GSDLOS=" + Gatherer.client_operating_system;
+            env[1] = "https_proxy=http://"+proxy_url; // HTTP protocol for https:// too
+                        // see also https://wiki.archlinux.org/index.php/proxy_settings
+            env[2] = "ftp_proxy=ftp://"+proxy_url;
+            env[3] = "GSDLHOME=" + Configuration.gsdl_path;
+            env[4] = "GSDLOS=" + Gatherer.client_operating_system;
 
             prcs = new SafeProcess(cmd, env, null);