improved ojo to detect proxy servers automatically (closes #304)

mojolicious · Mar 26, 2012 · b57372c · b57372c
1 parent f2bf2bd
commit b57372c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@ This file documents the revision history for Perl extension Mojolicious.
 
 2.69  2012-03-26
   - Changed number of redirects ojo and the get command will follow to 10.
+  - Improved ojo to detect proxy servers automatically.
   - Improved Mojo::DOM::CSS performance.
   - Improved documentation.
   - Improved Mojo::Reactor tests to be less strict.

diff --git a/lib/ojo.pm b/lib/ojo.pm
@@ -32,6 +32,9 @@ sub import {
   # Allow redirects
   $UA->max_redirects(10) unless defined $ENV{MOJO_MAX_REDIRECTS};
 
+  # Detect proxy
+  $UA->detect_proxy unless defined $ENV{MOJO_PROXY};
+
   # Application
   $UA->app(*{"${caller}::app"}->());
 
@@ -91,10 +94,10 @@ C<MOJO_MAX_REDIRECTS> environment variable.
 
   $ MOJO_MAX_REDIRECTS=0 perl -Mojo -E 'say g("mojolicio.us")->code'
 
-Proxy detection is disabled by default, but you can enable it with the
+Proxy detection is enabled by default, but you can disable it with the
 C<MOJO_PROXY> environment variable.
 
-  $ MOJO_PROXY=1 perl -Mojo -E 'say g("mojolicio.us")->body'
+  $ MOJO_PROXY=0 perl -Mojo -E 'say g("mojolicio.us")->body'
 
 =head1 FUNCTIONS
 

diff --git a/t/mojo/dom.t b/t/mojo/dom.t
@@ -2,17 +2,13 @@ use Mojo::Base -strict;
 
 use utf8;
 
-use Test::More tests => 726;
+use Test::More tests => 725;
 
 # "Homer gave me a kidney: it wasn't his, I didn't need it,
 #  and it came postage due- but I appreciated the gesture!"
-use ojo;
 use Mojo::DOM;
 use Mojo::Util 'encode';
 
-# ojo
-is x('<div>Hello ♥!</div>')->at('div')->text, 'Hello ♥!', 'right text';
-
 # Simple (basics)
 my $dom = Mojo::DOM->new->parse(
   '<div><div FOO="0" id="a">A</div><div id="b">B</div></div>');

diff --git a/t/mojo/user_agent_online.t b/t/mojo/user_agent_online.t
@@ -3,6 +3,7 @@ use Mojo::Base -strict;
 # Disable libev and TLS
 BEGIN {
   $ENV{MOJO_NO_TLS}  = 1;
+  $ENV{MOJO_PROXY}   = 0;
   $ENV{MOJO_REACTOR} = 'Mojo::Reactor::Poll';
 }
 

diff --git a/t/mojolicious/ojo.t b/t/mojolicious/ojo.t
@@ -6,6 +6,7 @@ use utf8;
 BEGIN {
   $ENV{MOJO_MODE}       = 'development';
   $ENV{MOJO_NO_BONJOUR} = $ENV{MOJO_NO_IPV6} = 1;
+  $ENV{MOJO_PROXY}      = 0;
   $ENV{MOJO_REACTOR}    = 'Mojo::Reactor::Poll';
 }