fix a few proxy bugs in Mojo::UserAgent (closes #1004)

mojolicious · Oct 16, 2016 · 70b728c · 70b728c
1 parent 684b567
commit 70b728c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
-7.09  2016-10-06
+7.09  2016-10-16
+  - Fixed a few proxy bugs in Mojo::UserAgent.
 
 7.08  2016-09-23
   - Added -i and -o options to get command.

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -130,7 +130,7 @@ sub _connect_proxy {
       my $id = $tx->connection;
       if ($tx->error || !$tx->res->is_status_class(200) || !$tx->keep_alive) {
         $old->res->error({message => 'Proxy connection failed'});
-        $self->_remove($id);
+        $self->_remove($id) if $id;
         return $self->$cb($old);
       }
 

diff --git a/t/mojo/websocket_proxy_tls.t b/t/mojo/websocket_proxy_tls.t
@@ -297,4 +297,26 @@ $tx = $ua->get("https://127.0.0.1:$port/proxy");
 is $tx->res->code, 200, 'right status';
 is $tx->res->body, "https://127.0.0.1:$port/proxy", 'right content';
 
+# Blocking request to bad proxy
+$ua    = Mojo::UserAgent->new;
+$proxy = Mojo::IOLoop::Server->generate_port;
+$ua->proxy->https("http://127.0.0.1:$proxy");
+$tx = $ua->get("https://127.0.0.1:$port/proxy");
+ok !$tx->success, 'no success';
+is $tx->error->{message}, 'Proxy connection failed', 'right error';
+
+# Non-blocking request to bad proxy
+($success, $err) = ();
+$ua->get(
+  "https://127.0.0.1:$port/proxy" => sub {
+    my ($ua, $tx) = @_;
+    $success = $tx->success;
+    $err     = $tx->error;
+    Mojo::IOLoop->stop;
+  }
+);
+Mojo::IOLoop->start;
+ok !$success, 'no success';
+is $err->{message}, 'Proxy connection failed', 'right error';
+
 done_testing();