Changeset 31874 for main/trunk

Show
Ignore:
Timestamp:
10.08.2017 20:22:15 (2 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm

    r31864 r31874  
    181181    if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}) 
    182182    { 
    183          
    184         if($self->{'url'} =~ m/^https\:/) { 
    185         $strOptions .= " -e https_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";   
    186         } else { 
    187         $strOptions .= " -e http_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} "; 
    188         }    
     183        $strOptions .= " -e https_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";   
     184        $strOptions .= " -e http_proxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";        
    189185         
    190186        if ($self->{'user_name'} && $self->{'user_password'})