improved non-blocking resolver by allowing it to be disabled

mojolicious · Sep 13, 2011 · 62057f8 · 62057f8
1 parent 164701e
commit 62057f8
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -10,6 +10,7 @@ This file documents the revision history for Perl extension Mojolicious.
         - Improved documentation. (rhaen, sri)
         - Improved test command to run tests in alphabetical order.
           (viliampucik)
+        - Improved non-blocking resolver by allowing it to be disabled.
         - Improved tests.
         - Fixed small bug in cookie jar.
         - Fixed small plugin loader bug.

diff --git a/lib/Mojo/IOLoop/Resolver.pm b/lib/Mojo/IOLoop/Resolver.pm
@@ -135,7 +135,10 @@ sub resolve {
   my $loop   = $self->ioloop;
   weaken $self;
   return $loop->defer(sub { $self->$cb([]) })
-    if !$server || !$t || ($t ne $DNS_TYPES->{PTR} && ($v4 || $v6));
+    if $ENV{MOJO_NO_RESOLVER}
+      || !$server
+      || !$t
+      || ($t ne $DNS_TYPES->{PTR} && ($v4 || $v6));
 
   # Build request
   warn "RESOLVE $type $name ($server)\n" if DEBUG;

diff --git a/lib/Mojolicious/Guides/Cheatsheet.pod b/lib/Mojolicious/Guides/Cheatsheet.pod
@@ -271,6 +271,13 @@ Note that L<IO::Socket::IP> must be installed for IPv6 support.
 
   MOJO_NO_IPV6=1
 
+=head2 C<MOJO_NO_RESOLVER>
+
+Disable non-blocking resolver support and fall back to blocking system
+resolver.
+
+  MOJO_NO_RESOLVER=1
+
 =head2 C<MOJO_NO_TLS>
 
 Disable TLS support, this might result in slightly better performance and

diff --git a/t/mojo/resolver_online.t b/t/mojo/resolver_online.t
@@ -11,7 +11,7 @@ use Test::More;
 plan skip_all => 'set TEST_ONLINE to enable this test (developer only!)'
   unless $ENV{TEST_ONLINE};
 plan skip_all => 'Perl 5.12 required for this test!' unless $] >= 5.012;
-plan tests => 18;
+plan tests => 20;
 
 use_ok 'Mojo::IOLoop';
 
@@ -49,6 +49,35 @@ $r->lookup(
 Mojo::IOLoop->start;
 ok $result, 'got an address';
 
+# Lookup with disabled resolver
+$result = undef;
+my $backup = $ENV{MOJO_NO_RESOLVER};
+$ENV{MOJO_NO_RESOLVER} = 1;
+$r->lookup(
+  'google.com',
+  sub {
+    my ($self, $address) = @_;
+    $result = $address;
+    Mojo::IOLoop->stop;
+  }
+);
+Mojo::IOLoop->start;
+ok !$result, 'got no address';
+$ENV{MOJO_NO_RESOLVER} = $backup;
+
+# Lookup again
+$result = undef;
+$r->lookup(
+  'google.com',
+  sub {
+    my ($self, $address) = @_;
+    $result = $address;
+    Mojo::IOLoop->stop;
+  }
+);
+Mojo::IOLoop->start;
+ok $result, 'got an address';
+
 # Resolve TXT record
 $result = undef;
 $r->resolve(