Changeset 14918

Timestamp:

2007-12-13T13:18:17+13:00 (16 years ago)

Author:

dmn

Message:

davidb's to allow for proxy's without authentication

File:

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

gsdl/trunk/perllib/downloaders/WgetDownload.pm

@@ -105 +105 @@
     my $strOptions = "";
     
-    if($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'} 
-       && $self->{'user_name'} && $self->{'user_password'} 
-       )
+    if($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'})
     {
-    $strOptions = " -e httpproxy=$self->{'proxy_host'}:$self->{'proxy_port'} --proxy-user=$self->{'user_name'}"." --proxy-passwd=$self->{'user_password'} -Y on ";
+
+    $strOptions .= " -e httpproxy=$self->{'proxy_host'}:$self->{'proxy_port'} ";
+
+    if ($self->{'user_name'} && $self->{'user_password'})
+    {
+        $strOptions .= "--proxy-user=$self->{'user_name'}"." --proxy-passwd=$self->{'user_password'}";
+    }
     }
+
+    $strOptions .= " -Y on ";
 
     return $strOptions;