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

Comparing AnyEvent/lib/AnyEvent/Handle.pm (file contents):
Revision 1.54 by root, Tue Jun 3 09:02:46 2008 UTC vs.
Revision 1.58 by root, Wed Jun 4 22:51:15 2008 UTC

 AnyEvent::Handle - non-blocking I/O on file handles via AnyEvent
 =cut
-our $VERSION = 4.12;
+our $VERSION = 4.13;
 =head1 SYNOPSIS
    use AnyEvent;
    use AnyEvent::Handle;
    if ($self->{tls}) {
       require Net::SSLeay;
       $self->starttls (delete $self->{tls}, delete $self->{tls_ctx});
    }
-#   $self->on_eof   (delete $self->{on_eof}  ) if $self->{on_eof};   # nop
-#   $self->on_error (delete $self->{on_error}) if $self->{on_error}; # nop
-#   $self->on_read  (delete $self->{on_read} ) if $self->{on_read};  # nop
-   $self->on_drain (delete $self->{on_drain}) if $self->{on_drain};
    $self->{_activity} = AnyEvent->now;
    $self->_timeout;
-   $self->start_read;
+   $self->on_drain (delete $self->{on_drain}) if $self->{on_drain};
+   $self->on_read  (delete $self->{on_read} ) if $self->{on_read};
    $self
 }
 sub _shutdown {
             $self->{on_timeout}($self);
          } else {
             $self->_error (&Errno::ETIMEDOUT);
          }
-         # callbakx could have changed timeout value, optimise
+         # callback could have changed timeout value, optimise
          return unless $self->{timeout};
          # calculate new after
          $after = $self->{timeout};
       }
       Scalar::Util::weaken $self;
+      return unless $self; # ->error could have destroyed $self
       $self->{_tw} ||= AnyEvent->timer (after => $after, cb => sub {
          delete $self->{_tw};
          $self->_timeout;
       });
                # no progress can be made (not enough data and no data forthcoming)
                return $self->_error (&Errno::EPIPE, 1);
             }
             unshift @{ $self->{_queue} }, $cb;
-            return;
+            last;
          }
       } elsif ($self->{on_read}) {
          $self->{on_read}($self);
          if (
-            $self->{_eof}                   # if no further data will arrive
-            && $len == length $self->{rbuf} # and no data has been consumed
+            $len == length $self->{rbuf} # if no data has been consumed
-            && !@{ $self->{_queue} }        # and the queue is still empty
+            && !@{ $self->{_queue} }     # and the queue is still empty
-            && $self->{on_read}             # and we still want to read data
+            && $self->{on_read}          # but we still have on_read
          ) {
+            # no further data will arrive
-            # then no progress can be made
+            # so no progress can be made
-            return $self->_error (&Errno::EPIPE, 1);
+            return $self->_error (&Errno::EPIPE, 1)
+               if $self->{_eof};
+            last; # more data might arrive
          }
       } else {
          # read side becomes idle
          delete $self->{_rw};
-         return;
+         last;
       }
    }
    $self->{on_eof}($self)
       if $self->{_eof} && $self->{on_eof};
+   # may need to restart read watcher
+   unless ($self->{_rw}) {
+      $self->start_read
+         if $self->{on_read} || @{ $self->{_queue} };
+   }
 }
 =item $handle->on_read ($cb)
 This replaces the currently set C<on_read> callback, or clears it (when
 sub on_read {
    my ($self, $cb) = @_;
    $self->{on_read} = $cb;
+   $self->_drain_rbuf if $cb;
 }
 =item $handle->rbuf
 Returns the read buffer (as a modifiable lvalue).
 =item $handle->stop_read
 =item $handle->start_read
 In rare cases you actually do not want to read anything from the
-socket. In this case you can call C<stop_read>. Neither C<on_read> no
+socket. In this case you can call C<stop_read>. Neither C<on_read> nor
 any queued callbacks will be executed then. To start reading again, call
 C<start_read>.
+Note that AnyEvent::Handle will automatically C<start_read> for you when
+you change the C<on_read> callback or push/unshift a read callback, and it
+will automatically C<stop_read> for you when neither C<on_read> is set nor
+there are any read requests in the queue.
 =cut
 sub stop_read {
    my ($self) = @_;
 }
 sub _dotls {
    my ($self) = @_;
+   my $buf;
    if (length $self->{_tls_wbuf}) {
       while ((my $len = Net::SSLeay::write ($self->{tls}, $self->{_tls_wbuf})) > 0) {
          substr $self->{_tls_wbuf}, 0, $len, "";
       }
    }
-   if (defined (my $buf = Net::SSLeay::BIO_read ($self->{_wbio}))) {
+   if (length ($buf = Net::SSLeay::BIO_read ($self->{_wbio}))) {
       $self->{wbuf} .= $buf;
       $self->_drain_wbuf;
    }
-   while (defined (my $buf = Net::SSLeay::read ($self->{tls}))) {
+   while (defined ($buf = Net::SSLeay::read ($self->{tls}))) {
+      if (length $buf) {
-      $self->{rbuf} .= $buf;
+         $self->{rbuf} .= $buf;
-      $self->_drain_rbuf;
+         $self->_drain_rbuf;
+      } else {
+         # let's treat SSL-eof as we treat normal EOF
+         $self->{_eof} = 1;
+         $self->_shutdown;
+         return;
+      }
    }
    my $err = Net::SSLeay::get_error ($self->{tls}, -1);
    if ($err!= Net::SSLeay::ERROR_WANT_READ ()) {

Diff Legend

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

Comparing AnyEvent/lib/AnyEvent/Handle.pm (file contents): Revision 1.54 by root, Tue Jun 3 09:02:46 2008 UTC vs. Revision 1.58 by root, Wed Jun 4 22:51:15 2008 UTC

Diff Legend

Comparing AnyEvent/lib/AnyEvent/Handle.pm (file contents):
Revision 1.54 by root, Tue Jun 3 09:02:46 2008 UTC vs.
Revision 1.58 by root, Wed Jun 4 22:51:15 2008 UTC