mention default cipher specification string

mojolicious · Jan 21, 2014 · 99a49fc · 99a49fc
1 parent 76cb552
commit 99a49fc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,6 @@
 
+4.69  2014-01-23
+
 4.68  2014-01-22
   - Added Mojo::DOM::Node.
   - Added contents and node methods to Mojo::DOM.

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -288,7 +288,8 @@ Path to the TLS cert file, defaults to a built-in test certificate.
 
   tls_ciphers => 'AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH'
 
-Cipher specification string.
+Cipher specification string, defaults to
+C<ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH>.
 
 =item tls_key
 

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -405,7 +405,8 @@ Path to the TLS cert file, defaults to a built-in test certificate.
 
   ciphers=AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH
 
-Cipher specification string.
+Cipher specification string, defaults to
+C<ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH>.
 
 =item key
 

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -43,7 +43,7 @@ has types     => sub { Mojolicious::Types->new };
 has validator => sub { Mojolicious::Validator->new };
 
 our $CODENAME = 'Top Hat';
-our $VERSION  = '4.68';
+our $VERSION  = '4.69';
 
 sub AUTOLOAD {
   my $self = shift;