[ViewVC] Diff of: cvs/AnyEvent/lib/AnyEvent/Handle.pm

Comparing AnyEvent/lib/AnyEvent/Handle.pm (file contents):
Revision 1.136 by root, Fri Jul 3 21:44:14 2009 UTC vs.
Revision 1.137 by root, Sat Jul 4 23:58:52 2009 UTC

 our $ERROR_WANT_READ;
 our $ERROR_ZERO_RETURN;
 sub _tls_error {
    my ($self, $err) = @_;
-      warn "$err,$!\n";#d#
    return $self->_error ($!, 1)
       if $err == Net::SSLeay::ERROR_SYSCALL ();
+   my $err =Net::SSLeay::ERR_error_string (Net::SSLeay::ERR_get_error ());
+   # reduce error string to look less scary
+   $err =~ s/^error:[0-9a-fA-F]{8}:[^:]+:([^:]+):/\L$1: /;
-   $self->_error (&Errno::EPROTO, 1,
+   $self->_error (&Errno::EPROTO, 1, $err);
-                  Net::SSLeay::ERR_error_string (Net::SSLeay::ERR_get_error ()));
 }
 # poll the write BIO and send the data if applicable
 # also decode read data if possible
 # this is basiclaly our TLS state machine
 If it an error to start a TLS handshake more than once per
 AnyEvent::Handle object (this is due to bugs in OpenSSL).
 =cut
+our %TLS_CACHE; #TODO not yet documented, should we?
 sub starttls {
    my ($self, $ssl, $ctx) = @_;
    require Net::SSLeay;
    if ("HASH" eq ref $ctx) {
       require AnyEvent::TLS;
       local $Carp::CarpLevel = 1; # skip ourselves when creating a new context
+      if ($ctx->{cache}) {
+         my $key = $ctx+0;
+         $ctx = $TLS_CACHE{$key} ||= new AnyEvent::TLS %$ctx;
+      } else {
-      $ctx = new AnyEvent::TLS %$ctx;
+         $ctx = new AnyEvent::TLS %$ctx;
+      }
    }
    $self->{tls_ctx} = $ctx || TLS_CTX ();
    $self->{tls}     = $ssl = $self->{tls_ctx}->_get_session ($ssl, $self, $self->{peername});

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines