--- cvsroot/EV/EV.xs	2007/10/27 13:28:31	1.6
+++ cvsroot/EV/EV.xs	2007/10/27 19:11:27	1.8
@@ -171,7 +171,7 @@
   ENTER;
   SAVETMPS;
 
-  if (!(ev->ev.ev_events & EV_PERSIST))
+  if (!(ev->ev.ev_events & EV_PERSIST) || (events & EV_TIMEOUT))
     ev->active = 0;
 
   PUSHMARK (SP);
@@ -180,12 +180,19 @@
   PUSHs (sv_2mortal (newSViv (events)));
   PUTBACK;
   call_sv (ev->cb, G_DISCARD | G_VOID | G_EVAL);
-  /*TODO: if err, call some logging function */
 
   if (ev->interval && !ev->active)
     e_start (ev);
 
   FREETMPS;
+
+  if (SvTRUE (ERRSV))
+    {
+      PUSHMARK (SP);
+      PUTBACK;
+      call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
+    }
+
   LEAVE;
 }
 
@@ -230,6 +237,14 @@
   call_sv (sv_2mortal (cb), G_DISCARD | G_VOID | G_EVAL);
 
   FREETMPS;
+
+  if (SvTRUE (ERRSV))
+    {
+      PUSHMARK (SP);
+      PUTBACK;
+      call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
+    }
+
   LEAVE;
 }
 
@@ -537,7 +552,7 @@
         STRLEN len;
         char *data = SvPVbyte (addr, len);
         if (len != (ix ? 16 : 4))
-          croak ("ipv4/ipv6 address to resolve must be given as 4/16 byte octet string");
+          croak ("ipv4/ipv6 address to be resolved must be given as 4/16 byte octet string");
 
         RETVAL = ix
           ? evdns_resolve_reverse_ipv6 ((struct in6_addr *)data, flags, dns_cb, (void *)SvREFCNT_inc (cb))