--- AnyEvent/lib/AnyEvent/Handle.pm	2008/07/27 08:37:56	1.79
+++ AnyEvent/lib/AnyEvent/Handle.pm	2008/08/21 19:13:05	1.84
@@ -16,7 +16,7 @@
 
 =cut
 
-our $VERSION = 4.22;
+our $VERSION = 4.232;
 
 =head1 SYNOPSIS
 
@@ -51,6 +51,9 @@
 filehandles. For utility functions for doing non-blocking connects and accepts
 on sockets see L<AnyEvent::Util>.
 
+The L<AnyEvent::Intro> tutorial contains some well-documented
+AnyEvent::Handle examples.
+
 In the following, when the documentation refers to of "bytes" then this
 means characters. As sysread and syswrite are used for all I/O, their
 treatment of characters applies to this module as well.
@@ -72,8 +75,9 @@
 
 The filehandle this L<AnyEvent::Handle> object will operate on.
 
-NOTE: The filehandle will be set to non-blocking (using
-AnyEvent::Util::fh_nonblocking).
+NOTE: The filehandle will be set to non-blocking mode (using
+C<AnyEvent::Util::fh_nonblocking>) by the constructor and needs to stay in
+that mode.
 
 =item on_eof => $cb->($handle)
 
@@ -81,10 +85,18 @@
 i.e. in the case of a socket, when the other side has closed the
 connection cleanly.
 
-While not mandatory, it is highly recommended to set an eof callback,
+For sockets, this just means that the other side has stopped sending data,
+you can still try to write data, and, in fact, one can return from the eof
+callback and continue writing data, as only the read part has been shut
+down.
+
+While not mandatory, it is I<highly> recommended to set an eof callback,
 otherwise you might end up with a closed socket while you are still
 waiting for data.
 
+If an EOF condition has been detected but no C<on_eof> callback has been
+set, then a fatal error will be raised with C<$!> set to <0>.
+
 =item on_error => $cb->($handle, $fatal)
 
 This is the error callback, which is called when, well, some error
@@ -92,10 +104,15 @@
 connect or a read error.
 
 Some errors are fatal (which is indicated by C<$fatal> being true). On
-fatal errors the handle object will be shut down and will not be
-usable. Non-fatal errors can be retried by simply returning, but it is
-recommended to simply ignore this parameter and instead abondon the handle
-object when this callback is invoked.
+fatal errors the handle object will be shut down and will not be usable
+(but you are free to look at the current C< ->rbuf >). Examples of fatal
+errors are an EOF condition with active (but unsatisifable) read watchers
+(C<EPIPE>) or I/O errors.
+
+Non-fatal errors can be retried by simply returning, but it is recommended
+to simply ignore this parameter and instead abondon the handle object
+when this callback is invoked. Examples of non-fatal errors are timeouts
+C<ETIMEDOUT>) or badly-formatted data (C<EBADMSG>).
 
 On callback entrance, the value of C<$!> contains the operating system
 error (or C<ENOSPC>, C<EPIPE>, C<ETIMEDOUT> or C<EBADMSG>).
@@ -290,6 +307,9 @@
    delete $self->{fh};
 
    $self->stoptls;
+
+   delete $self->{on_read};
+   delete $self->{_queue};
 }
 
 sub _error {
@@ -728,7 +748,7 @@
       defined $self->{rbuf_max}
       && $self->{rbuf_max} < length $self->{rbuf}
    ) {
-      return $self->_error (&Errno::ENOSPC, 1);
+      $self->_error (&Errno::ENOSPC, 1), return;
    }
 
    while () {
@@ -738,7 +758,7 @@
          unless ($cb->($self)) {
             if ($self->{_eof}) {
                # no progress can be made (not enough data and no data forthcoming)
-               $self->_error (&Errno::EPIPE, 1), last;
+               $self->_error (&Errno::EPIPE, 1), return;
             }
 
             unshift @{ $self->{_queue} }, $cb;
@@ -756,7 +776,7 @@
          ) {
             # no further data will arrive
             # so no progress can be made
-            $self->_error (&Errno::EPIPE, 1), last
+            $self->_error (&Errno::EPIPE, 1), return
                if $self->{_eof};
 
             last; # more data might arrive
@@ -768,8 +788,13 @@
       }
    }
 
-   $self->{on_eof}($self)
-      if $self->{_eof} && $self->{on_eof};
+   if ($self->{_eof}) {
+      if ($self->{on_eof}) {
+         $self->{on_eof}($self)
+      } else {
+         $self->_error (0, 1);
+      }
+   }
 
    # may need to restart read watcher
    unless ($self->{_rw}) {