Changeset 217 for client

Timestamp:

12/29/10 09:13:34 (13 years ago)

Author:

nanardon

Message:

• honor proxy settings

Location:

client/trunk

Files:

• bin/sophie (modified) (3 diffs)
• lib/Sophie/Client.pm (modified) (1 diff)

client/trunk/bin/sophie

@@ -16 +16 @@
     't=s' => \my $type,
     'd=s' => \my @options,
+    'proxy' => \my $proxy,
     'daemon' => \my $daemon,
 
@@ -37 +38 @@
     $pass        ||= $config{pass};
     $daemon      ||= $config{daemon};
+    $proxy       ||= $config{proxy};
 }
 
@@ -44 +46 @@
     password => $pass,
     type => $type,
+    proxy => $proxy,
 );
 

client/trunk/lib/Sophie/Client.pm

@@ -17 +17 @@
     );
     $self->timeout(20) if ($self->can('timeout'));
+    if ($options{proxy}) {
+        $self->useragent->proxy([ 'http' ], $options{proxy});
+    } else {
+        $self->useragent->env_proxy;
+    }
+
     $self->{options} = { %options };
+
 
     if ($options{login}) {