more consistent Mojo::IOLoop examples

mojolicious · Oct 21, 2011 · cdbc51b · cdbc51b
1 parent 2d2233c
commit cdbc51b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 This file documents the revision history for Perl extension Mojolicious.
 
 2.05    2011-10-22 00:00:00
+        - Improved documentation.
         - Fixed HTTPS proxy bug in Mojo::UserAgent.
 
 2.04    2011-10-21 00:00:00

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -711,13 +711,6 @@ Check if loop is running.
 
   my $id = Mojo::IOLoop->listen(port => 3000);
   my $id = $loop->listen(port => 3000);
-  my $id = $loop->listen({port => 3000});
-  my $id = $loop->listen(
-    port     => 443,
-    tls      => 1,
-    tls_cert => '/foo/server.cert',
-    tls_key  => '/foo/server.key'
-  );
 
 Create a new listen socket.
 Note that TLS support depends on L<IO::Socket::SSL> and IPv6 support on
@@ -886,11 +879,10 @@ Start the loop, this will block until C<stop> is called.
 
 =head2 C<start_tls>
 
-  $loop->start_tls($id);
-  $loop->start_tls($id => {
+  $loop->start_tls($id => (
     tls_cert => '/foo/client.cert',
     tls_key  => '/foo/client.key'
-  });
+  ));
 
 Start new TLS connection inside old connection.
 Note that TLS support depends on L<IO::Socket::SSL>.

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -394,7 +394,7 @@ sub _proxy_connect {
       if ($tx->req->url->scheme eq 'https') {
         return unless my $id = $tx->connection;
         $self->_loop->start_tls(
-          $id => {tls_cert => $self->cert, tls_key => $self->key});
+          $id => (tls_cert => $self->cert, tls_key => $self->key));
         $old->req->proxy(undef);
       }
 

diff --git a/t/mojo/websocket_proxy_tls.t b/t/mojo/websocket_proxy_tls.t
@@ -66,8 +66,8 @@ my $ua = Mojo::UserAgent->new;
 my $daemon =
   Mojo::Server::Daemon->new(app => app, ioloop => Mojo::IOLoop->singleton);
 my $port   = Mojo::IOLoop->new->generate_port;
-my $listen = "https://*:$port:t/mojo/certs/server.crt"
-  . ':t/mojo/certs/server.key:t/mojo/certs/ca.crt';
+my $listen = "https://*:$port"
+  . ':t/mojo/certs/server.crt:t/mojo/certs/server.key:t/mojo/certs/ca.crt';
 $daemon->listen([$listen]);
 $daemon->prepare_ioloop;