Changeset 31874 for main/trunk

Timestamp:

2017-08-10T20:22:15+12:00 (7 years ago)

Author:

ak19

Message:

Fix ahead of switching over to proxy env vars on Windows. This fix sets proxy settings for Windows downloads, so that http_proxy and https_proxy flags can both be set.

File:

• main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm (modified) (1 diff)

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

@@ -181 +181 @@
     if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'})
     {
-        
-        if($self->{'url'} =~ m/^https\:/) {
-        $strOptions .= " -e https_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";  
-        } else {
-        $strOptions .= " -e http_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";
-        }   
+        $strOptions .= " -e https_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";  
+        $strOptions .= " -e http_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";       
         
         if ($self->{'user_name'} && $self->{'user_password'})