Revert "unix,stream: clear read/write states on close/eof"

This reverts commit 12be29f.

The commit in question was introducing failures in the Node.js
test suite.

Refs: libuv#2943
Refs: libuv#2967
Refs: libuv#2409
PR-URL: libuv#2968
Reviewed-By: Santiago Gimeno <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>

Author: cjihrig

CMakeLists.txt

@@ -424,9 +424,6 @@ if(LIBUV_BUILD_TESTS)
        test/test-metrics.c
        test/test-multiple-listen.c
        test/test-mutexes.c
-       test/test-not-readable-nor-writable-on-read-error.c
-       test/test-not-readable-on-eof.c
-       test/test-not-writable-after-shutdown.c
        test/test-osx-select.c
        test/test-pass-always.c
        test/test-ping-pong.c

Makefile.am

@@ -206,9 +206,6 @@ test_run_tests_SOURCES = test/blackhole-server.c \
                          test/test-metrics.c \
                          test/test-multiple-listen.c \
                          test/test-mutexes.c \
-                         test/test-not-readable-nor-writable-on-read-error.c \
-                         test/test-not-readable-on-eof.c \
-                         test/test-not-writable-after-shutdown.c \
                          test/test-osx-select.c \
                          test/test-pass-always.c \
                          test/test-ping-pong.c \

src/unix/stream.c

@@ -1001,7 +1001,6 @@ uv_handle_type uv__handle_type(int fd) {
 static void uv__stream_eof(uv_stream_t* stream, const uv_buf_t* buf) {
   stream->flags |= UV_HANDLE_READ_EOF;
   stream->flags &= ~UV_HANDLE_READING;
-  stream->flags &= ~UV_HANDLE_READABLE;
   uv__io_stop(stream->loop, &stream->io_watcher, POLLIN);
   if (!uv__io_active(&stream->io_watcher, POLLOUT))
     uv__handle_stop(stream);
@@ -1189,7 +1188,6 @@ static void uv__read(uv_stream_t* stream) {
 #endif
       } else {
         /* Error. User should call uv_close(). */
-        stream->flags &= ~(UV_HANDLE_READABLE | UV_HANDLE_WRITABLE);
         stream->read_cb(stream, UV__ERR(errno), &buf);
         if (stream->flags & UV_HANDLE_READING) {
           stream->flags &= ~UV_HANDLE_READING;
@@ -1278,7 +1276,6 @@ int uv_shutdown(uv_shutdown_t* req, uv_stream_t* stream, uv_shutdown_cb cb) {
   req->cb = cb;
   stream->shutdown_req = req;
   stream->flags |= UV_HANDLE_SHUTTING;
-  stream->flags &= ~UV_HANDLE_WRITABLE;
 
   uv__io_start(stream->loop, &stream->io_watcher, POLLOUT);
   uv__stream_osx_interrupt_select(stream);

src/win/tcp.c

@@ -1015,7 +1015,6 @@ void uv_process_tcp_read_req(uv_loop_t* loop, uv_tcp_t* handle,
          */
         err = WSAECONNRESET;
       }
-      handle->flags &= ~(UV_HANDLE_READABLE | UV_HANDLE_WRITABLE);
 
       handle->read_cb((uv_stream_t*)handle,
                       uv_translate_sys_error(err),
@@ -1097,7 +1096,6 @@ void uv_process_tcp_read_req(uv_loop_t* loop, uv_tcp_t* handle,
              * Unix. */
             err = WSAECONNRESET;
           }
-          handle->flags &= ~(UV_HANDLE_READABLE | UV_HANDLE_WRITABLE);
 
           handle->read_cb((uv_stream_t*)handle,
                           uv_translate_sys_error(err),

test/echo-server.c

@@ -69,6 +69,7 @@ static void after_shutdown(uv_shutdown_t* req, int status) {
   free(req);
 }
 
+
 static void after_read(uv_stream_t* handle,
                        ssize_t nread,
                        const uv_buf_t* buf) {
@@ -95,20 +96,13 @@ static void after_read(uv_stream_t* handle,
   /*
    * Scan for the letter Q which signals that we should quit the server.
    * If we get QS it means close the stream.
-   * If we get QSH it means disable linger before close the socket.
    */
   if (!server_closed) {
     for (i = 0; i < nread; i++) {
       if (buf->base[i] == 'Q') {
         if (i + 1 < nread && buf->base[i + 1] == 'S') {
-          int reset = 0;
-          if (i + 2 < nread && buf->base[i + 2] == 'H')
-            reset = 1;
           free(buf->base);
-          if (reset && handle->type == UV_TCP)
-            ASSERT(0 == uv_tcp_close_reset((uv_tcp_t*) handle, on_close));
-          else
-            uv_close((uv_handle_t*) handle, on_close);
+          uv_close((uv_handle_t*)handle, on_close);
           return;
         } else {
           uv_close(server, on_server_close);

test/test-list.h

@@ -501,10 +501,6 @@ TEST_DECLARE   (handle_type_name)
 TEST_DECLARE   (req_type_name)
 TEST_DECLARE   (getters_setters)
 
-TEST_DECLARE   (not_writable_after_shutdown)
-TEST_DECLARE   (not_readable_nor_writable_on_read_error)
-TEST_DECLARE   (not_readable_on_eof)
-
 #ifndef _WIN32
 TEST_DECLARE  (fork_timer)
 TEST_DECLARE  (fork_socketpair)
@@ -1119,13 +1115,6 @@ TASK_LIST_START
   TEST_ENTRY  (idna_toascii)
 #endif
 
-  TEST_ENTRY    (not_writable_after_shutdown)
-  TEST_HELPER   (not_writable_after_shutdown, tcp4_echo_server)
-  TEST_ENTRY    (not_readable_nor_writable_on_read_error)
-  TEST_HELPER   (not_readable_nor_writable_on_read_error, tcp4_echo_server)
-  TEST_ENTRY    (not_readable_on_eof)
-  TEST_HELPER   (not_readable_on_eof, tcp4_echo_server)
-
   TEST_ENTRY  (metrics_idle_time)
   TEST_ENTRY  (metrics_idle_time_thread)
   TEST_ENTRY  (metrics_idle_time_zero)