Changeset 14918

Show
Ignore:
Timestamp:
13.12.2007 13:18:17 (12 years ago)
Author:
dmn
Message:

davidb's to allow for proxy's without authentication

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/downloaders/WgetDownload.pm

    r14657 r14918  
    105105    my $strOptions = ""; 
    106106     
    107     if($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}  
    108        && $self->{'user_name'} && $self->{'user_password'}  
    109        ) 
     107    if($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}) 
    110108    { 
    111     $strOptions = " -e httpproxy=$self->{'proxy_host'}:$self->{'proxy_port'} --proxy-user=$self->{'user_name'}"." --proxy-passwd=$self->{'user_password'} -Y on "; 
     109 
     110    $strOptions .= " -e httpproxy=$self->{'proxy_host'}:$self->{'proxy_port'} "; 
     111 
     112    if ($self->{'user_name'} && $self->{'user_password'}) 
     113    { 
     114        $strOptions .= "--proxy-user=$self->{'user_name'}"." --proxy-passwd=$self->{'user_password'}"; 
     115    } 
    112116    } 
     117 
     118    $strOptions .= " -Y on "; 
    113119 
    114120    return $strOptions;