Changeset 31880 for main/trunk/greenstone2/perllib/downloaders/WebDownload.pm

Timestamp:

2017-08-14T22:23:04+12:00 (7 years ago)

Author:

ak19

Message:

All the changes that were required to set up multiple proxy servers, one for HTTP, one for HTTPS, one for FTP. Still need to test on Windows

File:

• main/trunk/greenstone2/perllib/downloaders/WebDownload.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/downloaders/WebDownload.pm

@@ -193 +193 @@
     my $strBaseCMD = $strOptions." --tries=2 -q -O - \"$self->{'url'}\"";
 
-    #&util::print_env(STDERR, "https_proxy", "http_proxy", "HTTPS_PROXY", "HTTP_PROXY", "ftp_proxy", "FTP_PROXY");
+    #&util::print_env(STDERR, "https_proxy", "http_proxy", "ftp_proxy");
     #&util::print_env(STDERR);  
     
@@ -201 +201 @@
     
     print STDERR "Server information is unavailable.\n";
-
-    #&util::print_env(STDERR, "https_proxy", "http_proxy");
-    
-    if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}) { # if proxying set, the settings may be wrong
-        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxied_connect_failed_info}\n", $self->{'proxy_host'}, $self->{'proxy_port'});
+    
+    if ($self->{'proxy_on'}) { # if proxying set, the settings may be wrong
+        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxied_connect_failed_info}\n");
+        
+        if($self->{'http_proxy_host'} && defined $self->{'http_proxy_port'}) {
+        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.http_proxy_settings}\n", $self->{'http_proxy_host'}, $self->{'http_proxy_port'});
+        }
+        if($self->{'https_proxy_host'} && defined $self->{'https_proxy_port'}) {
+        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.https_proxy_settings}\n", $self->{'https_proxy_host'}, $self->{'https_proxy_port'});
+        }
+        if($self->{'ftp_proxy_host'} && defined $self->{'ftp_proxy_port'}) {
+        &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.ftp_proxy_settings}\n", $self->{'ftp_proxy_host'}, $self->{'ftp_proxy_port'});
+        }
     } else { # else no proxy set, the user may need proxy settings
         &gsprintf::gsprintf_multiline(STDERR, "{WebDownload.proxyless_connect_failed_info}\n");