Showing with 6 additions and 5 deletions.

+6 −2 src/win/tcp.c

+0 −3 test/test-tcp-write-queue-order.c
diff --git a/src/win/tcp.c b/src/win/tcp.c
@@ -1024,8 +1024,12 @@ void uv_process_tcp_write_req(uv_loop_t* loop, uv_tcp_t* handle,
   }
 
   if (req->cb) {
-    err = GET_REQ_SOCK_ERROR(req);
-    req->cb(req, uv_translate_sys_error(err));
+    err = uv_translate_sys_error(GET_REQ_SOCK_ERROR(req));
+    if (err == UV_ECONNABORTED) {
+      /* use UV_ECANCELED for consistency with Unix */
+      err = UV_ECANCELED;
+    }
+    req->cb(req, err);
   }
 
   handle->write_reqs_pending--;

diff --git a/test/test-tcp-write-queue-order.c b/test/test-tcp-write-queue-order.c
@@ -126,10 +126,7 @@ TEST_IMPL(tcp_write_queue_order) {
   ASSERT(connect_cb_called == 1);
   ASSERT(connection_cb_called == 1);
   ASSERT(write_callbacks > 0);
-#ifndef _WIN32
-  /* on Windows we never get ECANCELED */
   ASSERT(write_cancelled_callbacks > 0);
-#endif
   ASSERT(write_callbacks +
          write_error_callbacks +
          write_cancelled_callbacks == REQ_COUNT);