Windows: Fix afd::POLL_ABORT handling

src/sys/windows/event.rs

@@ -29,7 +29,7 @@ pub fn is_error(event: &Event) -> bool {
 }
 
 pub fn is_read_closed(event: &Event) -> bool {
-    event.flags & afd::POLL_DISCONNECT != 0
+    event.flags & (afd::POLL_ABORT | afd::POLL_DISCONNECT) != 0
 }
 
 pub fn is_write_closed(event: &Event) -> bool {

src/sys/windows/selector.rs

@@ -720,11 +720,11 @@ fn interests_to_afd_flags(interests: Interest) -> u32 {
 
     if interests.is_readable() {
         // afd::POLL_DISCONNECT for is_read_hup()
-        flags |= afd::POLL_RECEIVE | afd::POLL_ACCEPT | afd::POLL_DISCONNECT;
+        flags |= afd::POLL_RECEIVE | afd::POLL_ACCEPT | afd::POLL_DISCONNECT | afd::POLL_ABORT;
     }
 
     if interests.is_writable() {
-        flags |= afd::POLL_SEND;
+        flags |= afd::POLL_SEND | afd::POLL_ABORT;
     }
 
     flags

tests/tcp_stream.rs

@@ -608,6 +608,42 @@ fn tcp_shutdown_server_write_close_event() {
     handle.join().expect("failed to join thread");
 }
 
+#[test]
+fn tcp_reset_close_event() {
+    let (mut poll, mut events) = init_with_poll();
+
+    let listener = net::TcpListener::bind(any_local_address()).unwrap();
+    let sockaddr = listener.local_addr().unwrap();
+    let mut stream = TcpStream::connect(sockaddr).unwrap();
+
+    poll.registry()
+        .register(&mut stream, ID1, Interest::READABLE.add(Interest::WRITABLE))
+        .unwrap();
+
+    let server_stream = listener.accept().unwrap();
+
+    expect_events(
+        &mut poll,
+        &mut events,
+        vec![ExpectEvent::new(ID1, Interest::WRITABLE)],
+    );
+    checked_write!(stream.write(DATA1));
+
+    // Try to read something.
+    assert_would_block(stream.read(&mut [0]));
+
+    // Server goes away.
+    drop(server_stream);
+
+    expect_events(
+        &mut poll,
+        &mut events,
+        vec![ExpectEvent::new(ID1, Readiness::READ_CLOSED)],
+    );
+
+    expect_no_events(&mut poll, &mut events);
+}
+
 #[test]
 #[cfg_attr(
     windows,