better workaround

mojolicious · May 27, 2012 · 337c632 · 337c632
1 parent 3578ae6
commit 337c632
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-2.97  2012-05-26
+2.97  2012-05-27
   - Added workaround to make IO::Socket::SSL work with IO::Socket::IP.
   - Improved documentation.
   - Improved tests.

diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -18,7 +18,7 @@ use constant TLS_READ  => TLS ? IO::Socket::SSL::SSL_WANT_READ()  : 0;
 use constant TLS_WRITE => TLS ? IO::Socket::SSL::SSL_WANT_WRITE() : 0;
 
 # Fix IO::Socket::SSL to work with IO::Socket::IP
-$IO::Socket::SSL::ISA[0] = 'IO::Socket::IP' if IPV6;
+$IO::Socket::SSL::ISA[0] = 'IO::Socket::IP' if IPV6 && TLS;
 
 # "It's like my dad always said: eventually, everybody gets shot."
 has reactor => sub {

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -21,7 +21,7 @@ use constant TLS_READ  => TLS ? IO::Socket::SSL::SSL_WANT_READ()  : 0;
 use constant TLS_WRITE => TLS ? IO::Socket::SSL::SSL_WANT_WRITE() : 0;
 
 # Fix IO::Socket::SSL to work with IO::Socket::IP
-$IO::Socket::SSL::ISA[0] = 'IO::Socket::IP' if IPV6;
+$IO::Socket::SSL::ISA[0] = 'IO::Socket::IP' if IPV6 && TLS;
 
 # To regenerate the certificate run this command (18.04.2012)
 # openssl req -new -x509 -keyout server.key -out server.crt -nodes -days 7300