updated Changes file

mojolicious · Jul 10, 2012 · d827651 · d827651
1 parent c4dae0c
commit d827651
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,7 @@
 
-3.06  2012-07-10
+3.06  2012-07-11
+  - Added tls_verify option to Mojo::IOLoop::Server->listen. (scottw)
+  - Added verify parameter to Mojo::Server::Daemon->listen. (scottw)
   - Improved documentation.
   - Improved tests.
   - Fixed small bug in Mojo::UserAgent that prevented port reuse.

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -100,7 +100,7 @@ sub listen {
   %$options = (
     %$options,
     SSL_ca_file => -T $args->{tls_ca} ? $args->{tls_ca} : undef,
-    SSL_verify_mode => exists $args->{tls_verify} ? $args->{tls_verify} : 0x03
+    SSL_verify_mode => defined $args->{tls_verify} ? $args->{tls_verify} : 0x03
   ) if $args->{tls_ca};
 }
 
@@ -266,7 +266,7 @@ Path to the TLS key file, defaults to a built-in test key.
 
 =item C<tls_verify>
 
-SSL verify mode flags, defaults to 0x03.
+TLS verification mode, defaults to C<0x03>.
 
 =back
 

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -153,11 +153,12 @@ sub _listen {
     port     => $url->port,
     tls_ca   => scalar $query->param('ca'),
     tls_cert => scalar $query->param('cert'),
-    tls_key  => scalar $query->param('key')
+    tls_key  => scalar $query->param('key'),
   };
+  my $verify = $query->param('verify');
+  $options->{tls_verify} = hex $verify if defined $verify;
   delete $options->{address} if $options->{address} eq '*';
   my $tls = $options->{tls} = $url->scheme eq 'https' ? 1 : undef;
-  $options->{tls_verify} = hex($query->param('verify')) if $query->param('verify');
 
   # Listen
   weaken $self;
@@ -386,7 +387,7 @@ Path to the TLS key file, defaults to a built-in test key.
 
 =item C<verify>
 
-SSL verify mode flags, defaults to 0x03.
+TLS verification mode, defaults to C<0x03>.
 
 =back
 

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -887,6 +887,8 @@ Ryan Jendoubi
 
 Sascha Kiefer
 
+Scott Wiersdorf
+
 Sergey Zasenko
 
 Simon Bertrang

diff --git a/t/mojo/ioloop_tls.t b/t/mojo/ioloop_tls.t
@@ -272,8 +272,8 @@ ok !$server_err, 'no error';
 ok $client_err, 'has error';
 
 # Ignore invalid client certificate
-$loop         = Mojo::IOLoop->new;
-$port         = Mojo::IOLoop->generate_port;
+$loop       = Mojo::IOLoop->new;
+$port       = Mojo::IOLoop->generate_port;
 $server_err = $client_err = '';
 $loop->server(
   address    => '127.0.0.1',